git-svn-id: https://192.168.57.71/svn/jsgkj@1535 931142cf-59ea-a443-aa0e-51397b428577

gkjsjy/trunk/src/com/cxfws/gkjyxkgl/service/impl/XkzbgWebService.java

@@ -27,6 +27,7 @@ import com.cxfws.gkjyxkgl.service.IXkzbgWebService;
 import com.cxfws.gkjyxkgl.service.vo.XkzbgfVo;
 import com.xt.jygl.common.BaseWebCtl;
 import com.xt.jygl.common.Constants;
+import com.xt.jygl.common.GlobalData;
 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
 import com.xt.jygl.gkjcxx.gk.service.GkService;
 import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
@@ -808,13 +809,13 @@ public class XkzbgWebService extends BaseWebCtl implements IXkzbgWebService{
 			}
 			public List<String>  getGq(){
 				String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
-				UserEntity userEntity = userdao.findByUname(userName);
+				UserEntity userEntity = userdao.findByUnameszd(userName,GlobalData.CITY_CODE);
 				List<String> gqlist = gqService.findGqListByUserId(userEntity.getId());
 				return gqlist;
 			}
 			public UserEntity getUser(){
 				String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
-				UserEntity userEntity = userdao.findByUname(userName);
+				UserEntity userEntity = userdao.findByUnameszd(userName,GlobalData.CITY_CODE);
 				return userEntity;
 			}
 }

gkjsjy/trunk/src/com/cxfws/gkjyxkgl/service/impl/XkzsqWebService.java

@@ -28,6 +28,7 @@ import com.cxfws.gkjyxkgl.service.IXkzsqWebService;
 import com.cxfws.gkjyxkgl.service.vo.XkzsqfVo;
 import com.xt.jygl.common.BaseWebCtl;
 import com.xt.jygl.common.Constants;
+import com.xt.jygl.common.GlobalData;
 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
 import com.xt.jygl.gkjcxx.gk.service.GkService;
 import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
@@ -755,13 +756,13 @@ public class XkzsqWebService extends BaseWebCtl implements IXkzsqWebService{
 		}
 		public List<String>  getGq(){
 			String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
-			UserEntity userEntity = userdao.findByUname(userName);
+			UserEntity userEntity = userdao.findByUnameszd(userName,GlobalData.CITY_CODE);
 			List<String> gqlist = gqService.findGqListByUserId(userEntity.getId());
 			return gqlist;
 		}
 		public UserEntity getUser(){
 			String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
-			UserEntity userEntity = userdao.findByUname(userName);
+			UserEntity userEntity = userdao.findByUnameszd(userName,GlobalData.CITY_CODE);
 			return userEntity;
 		}
 		

gkjsjy/trunk/src/com/cxfws/gkjyxkgl/service/impl/XkzyxWebService.java

@@ -29,6 +29,7 @@ import com.xt.jygl.accessory.entity.AccessoryEntity;
 import com.xt.jygl.accessory.service.AccessoryService;
 import com.xt.jygl.common.BaseWebCtl;
 import com.xt.jygl.common.Constants;
+import com.xt.jygl.common.GlobalData;
 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
 import com.xt.jygl.gkjcxx.gk.service.GkService;
 import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
@@ -528,13 +529,13 @@ public class XkzyxWebService extends BaseWebCtl implements IXkzyxWebService {
 				}
 				public List<String>  getGq(){
 					String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
-					UserEntity userEntity = userdao.findByUname(userName);
+					UserEntity userEntity = userdao.findByUnameszd(userName,GlobalData.CITY_CODE);
 					List<String> gqlist = gqService.findGqListByUserId(userEntity.getId());
 					return gqlist;
 				}
 				public UserEntity getUser(){
 					String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
-					UserEntity userEntity = userdao.findByUname(userName);
+					UserEntity userEntity = userdao.findByUnameszd(userName,GlobalData.CITY_CODE);
 					return userEntity;
 				}
 }

gkjsjy/trunk/src/com/cxfws/gkjyxkgl/service/impl/XkzzxWebService.java

@@ -27,6 +27,7 @@ import com.cxfws.gkjyxkgl.service.vo.XkzzxfVo;
 import com.xt.jygl.accessory.service.AccessoryService;
 import com.xt.jygl.common.BaseWebCtl;
 import com.xt.jygl.common.Constants;
+import com.xt.jygl.common.GlobalData;
 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
 import com.xt.jygl.gkjcxx.gk.service.GkService;
 import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
@@ -581,13 +582,13 @@ public class XkzzxWebService extends BaseWebCtl implements IXkzzxWebService {
 		}
 		public List<String>  getGq(){
 			String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
-			UserEntity userEntity = userdao.findByUname(userName);
+			UserEntity userEntity = userdao.findByUnameszd(userName,GlobalData.CITY_CODE);
 			List<String> gqlist = gqService.findGqListByUserId(userEntity.getId());
 			return gqlist;
 		}
 		public UserEntity getUser(){
 			String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
-			UserEntity userEntity = userdao.findByUname(userName);
+			UserEntity userEntity = userdao.findByUnameszd(userName,GlobalData.CITY_CODE);
 			return userEntity;
 		}
 }

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/BwxxService.java

@@ -25,6 +25,7 @@ import org.springframework.stereotype.Service;
 import com.cxfws.config.utils.CxfwsUtils;
 import com.cxfws.jyrxxgl.service.IBwxxService;
 import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.common.GlobalData;
 import com.xt.jygl.gkjcxx.gk.service.GkService;
 import com.xt.jygl.gkjcxx.gq.service.GqService;
 import com.xt.jygl.gkjygl.gkjyr.jyrbw.service.BwService;
@@ -110,7 +111,7 @@ public class BwxxService extends BaseWebCtl implements IBwxxService{
 								list.add(cb.like(root.get("bwyt").as(String.class), "%" + bwbwyt + "%"));
 							} 
 							String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
-							UserEntity userEntity = userdao.findByUname(userName);
+							UserEntity userEntity = userdao.findByUnameszd(userName,GlobalData.CITY_CODE);
 							if (userEntity.getSsjyr()!=null) {
 								list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
 							} else {

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/CgxxService.java

@@ -27,6 +27,7 @@ import org.springframework.stereotype.Service;
 import com.cxfws.config.utils.CxfwsUtils;
 import com.cxfws.jyrxxgl.service.ICgxxService;
 import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.common.GlobalData;
 import com.xt.jygl.gkjcxx.gq.service.GqService;
 import com.xt.jygl.gkjygl.gkjyr.jyrcg.entity.CgEntity;
 import com.xt.jygl.gkjygl.gkjyr.jyrcg.service.CgService;
@@ -85,7 +86,7 @@ public class CgxxService extends BaseWebCtl implements ICgxxService{
 				} 
 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
 				String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
-				UserEntity userEntity = userdao.findByUname(userName);
+				UserEntity userEntity = userdao.findByUnameszd(userName,GlobalData.CITY_CODE);
 				if (userEntity.getSsjyr()!=null) {
 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
 				} else {

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/CkxxService.java

@@ -25,6 +25,7 @@ import org.springframework.stereotype.Service;
 import com.cxfws.config.utils.CxfwsUtils;
 import com.cxfws.jyrxxgl.service.ICkxxService;
 import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.common.GlobalData;
 import com.xt.jygl.gkjcxx.gq.service.GqService;
 import com.xt.jygl.gkjygl.gkjyr.jyrck.entity.CkEntity;
 import com.xt.jygl.gkjygl.gkjyr.jyrck.service.CkService;
@@ -89,7 +90,7 @@ public class CkxxService extends BaseWebCtl implements ICkxxService{
 				} 
 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
 				String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
-				UserEntity userEntity = userdao.findByUname(userName);
+				UserEntity userEntity = userdao.findByUnameszd(userName,GlobalData.CITY_CODE);
 				if (userEntity.getSsjyr()!=null) {
 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
 				} else {

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/DcxxService.java

@@ -25,6 +25,7 @@ import org.springframework.stereotype.Service;
 import com.cxfws.config.utils.CxfwsUtils;
 import com.cxfws.jyrxxgl.service.IDcxxService;
 import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.common.GlobalData;
 import com.xt.jygl.gkjcxx.gq.service.GqService;
 import com.xt.jygl.gkjygl.gkjyr.jyrdc.entity.DcEntity;
 import com.xt.jygl.gkjygl.gkjyr.jyrdc.service.DcService;
@@ -89,7 +90,7 @@ public class DcxxService extends BaseWebCtl implements IDcxxService{
 				}
 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
 				String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
-				UserEntity userEntity = userdao.findByUname(userName);
+				UserEntity userEntity = userdao.findByUnameszd(userName,GlobalData.CITY_CODE);
 				if (userEntity.getSsjyr()!=null) {
 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
 				} else {

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/JyrjbxxService.java

@@ -30,6 +30,7 @@ import com.cxfws.config.utils.CxfwsUtils;
 import com.cxfws.jyrxxgl.service.IJyrjbxxService;
 import com.xt.jygl.common.BaseWebCtl;
 import com.xt.jygl.common.Constants;
+import com.xt.jygl.common.GlobalData;
 import com.xt.jygl.ggfwxxgl.jdtx.service.TxService;
 import com.xt.jygl.ggfwxxgl.tzgg.ggxx.service.GgxxtxService;
 import com.xt.jygl.gkjcxx.ax.entity.AxEntity;
@@ -404,7 +405,7 @@ public class JyrjbxxService extends BaseWebCtl implements IJyrjbxxService {
 					}
 					// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
 					String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
-					UserEntity userEntity = userdao.findByUname(userName);
+					UserEntity userEntity = userdao.findByUnameszd(userName,GlobalData.CITY_CODE);
 					if (isJyr()) {
 						list.add(cb.like(root.get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
 					} else {

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/MtxxService.java

@@ -26,6 +26,7 @@ import org.springframework.stereotype.Service;
 import com.cxfws.config.utils.CxfwsUtils;
 import com.cxfws.jyrxxgl.service.IMtxxService;
 import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.common.GlobalData;
 import com.xt.jygl.gkjcxx.gq.service.GqService;
 import com.xt.jygl.gkjcxx.mt.entity.MtEntity;
 import com.xt.jygl.gkjcxx.mt.service.MtService;
@@ -104,7 +105,7 @@ public class MtxxService extends BaseWebCtl implements IMtxxService{
 				}
 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
 				String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
-				UserEntity userEntity = userdao.findByUname(userName);
+				UserEntity userEntity = userdao.findByUnameszd(userName,GlobalData.CITY_CODE);
 				if (userEntity.getSsjyr()!=null) {
 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
 				} else {

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/QytzxxService.java

@@ -25,6 +25,7 @@ import org.springframework.stereotype.Service;
 import com.cxfws.config.utils.CxfwsUtils;
 import com.cxfws.jyrxxgl.service.IQytzxxService;
 import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.common.GlobalData;
 import com.xt.jygl.gkjcxx.gq.service.GqService;
 import com.xt.jygl.gkjygl.gkjyr.qytz.entity.QytzEntity;
 import com.xt.jygl.gkjygl.gkjyr.qytz.service.QytzService;
@@ -83,7 +84,7 @@ public class QytzxxService extends BaseWebCtl implements IQytzxxService{
 				}
 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
 				String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
-				UserEntity userEntity = userdao.findByUname(userName);
+				UserEntity userEntity = userdao.findByUnameszd(userName,GlobalData.CITY_CODE);
 				if (userEntity.getSsjyr()!=null) {
 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
 				} else {

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/SssbxxService.java

@@ -26,6 +26,7 @@ import org.springframework.stereotype.Service;
 import com.cxfws.config.utils.CxfwsUtils;
 import com.cxfws.jyrxxgl.service.ISssbxxService;
 import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.common.GlobalData;
 import com.xt.jygl.gkjcxx.gq.service.GqService;
 import com.xt.jygl.gkjygl.gkjyr.sssb.entity.SssbEntity;
 import com.xt.jygl.gkjygl.gkjyr.sssb.service.SssbService;
@@ -85,7 +86,7 @@ public class SssbxxService extends BaseWebCtl implements ISssbxxService{
 				} 
 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
 				String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
-				UserEntity userEntity = userdao.findByUname(userName);
+				UserEntity userEntity = userdao.findByUnameszd(userName,GlobalData.CITY_CODE);
 				if (userEntity.getSsjyr()!=null) {
 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
 				} else {

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/ZxjxxxService.java

@@ -25,6 +25,7 @@ import org.springframework.stereotype.Service;
 import com.cxfws.config.utils.CxfwsUtils;
 import com.cxfws.jyrxxgl.service.IZxjxxxService;
 import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.common.GlobalData;
 import com.xt.jygl.gkjcxx.gq.service.GqService;
 import com.xt.jygl.gkjygl.gkjyr.zxjx.entity.ZxjxEntity;
 import com.xt.jygl.gkjygl.gkjyr.zxjx.service.ZxjxService;
@@ -85,7 +86,7 @@ public class ZxjxxxService extends BaseWebCtl implements IZxjxxxService{
 				} 
 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
 				String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
-				UserEntity userEntity = userdao.findByUname(userName);
+				UserEntity userEntity = userdao.findByUnameszd(userName,GlobalData.CITY_CODE);
 				if (userEntity.getSsjyr()!=null) {
 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
 				} else {

gkjsjy/trunk/src/com/cxfws/todo/service/impl/TODOService.java

@@ -797,13 +797,13 @@ public class TODOService extends BaseWebCtl implements ITODOService {
 		
 		public List<String>  getGq(){
 			String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
-			UserEntity userEntity = userdao.findByUname(userName);
+			UserEntity userEntity = userdao.findByUnameszd(userName,GlobalData.CITY_CODE);
 			List<String> gqlist = gqService.findGqListByUserId(userEntity.getId());
 			return gqlist;
 		}
 		public UserEntity getUser(){
 			String userName=CxfwsUtils.userNameFromHeaderInfo(wscontext);
-			UserEntity userEntity = userdao.findByUname(userName);
+			UserEntity userEntity = userdao.findByUnameszd(userName,GlobalData.CITY_CODE);
 			return userEntity;
 		}
 }