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

gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/webservice/DcsbWebService.java

@@ -96,12 +96,24 @@ public class DcsbWebService extends BaseWebCtl {
 		return dcsb;
 	}
 
-	public List<DcsbEntity> query(int start, int pageSize) {
-		UserEntity userEntity = getWebServiceUser();
-		if (userEntity == null) {
+	public List<DcsbEntity> query(int start, int pageSize, String userId) {
+		UserEntity user = securityMgr.userService().findById(userId);
+		if (user == null) {
 			return null;
 		}
 		List<PredicateModel> filterList = new ArrayList<PredicateModel>();
+		// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
+		if (user.getSsjyr() != null) {
+			addNotEmptyModel(filterList, "ssjyr.id", user.getSsjyr().getId(), Operator.EQ);
+		} else {
+			addNotEmptyModel(filterList, "recordStatus", BaseEntity.RECORD_STATE_VALID, Operator.NEQ);
+			List<String> gqList = gqService.findGqListByUserId(user.getId());
+			if (gqList != null) {
+				for (String id : gqList) {
+					addNotEmptyModel(filterList, "szgq.id", id, Operator.EQ, JoinType.OR);
+				}
+			}
+		}
 		// 只检索非删除状态记录
 		addNotEmptyModel(filterList, "recordStatus", BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
 		SimplePageRequest page = new SimplePageRequest();
@@ -178,13 +190,16 @@ public class DcsbWebService extends BaseWebCtl {
 	public boolean submit(DcsbEntity entity, String userId) {
 		if (entity != null && entity.getSsjyr() != null && entity.getSsjyr().getId() != null) {
 			GkjyrEntity jyr = gkjyrService.findOne(entity.getSsjyr().getId());
-			if (StringUtils.isEmpty(entity.getHwzldedl())) {
-				CodeEntity code = securityMgr.codeService().findOne(entity.getHwzl().getId());
-				entity.setHwzldedl(code);
+			if (StringUtils.isEmpty(entity.getHwzldedl().getId())) {
+				entity.setHwzldedl(null);
 			}
 			if (jyr == null) {
 				return false;
 			}
+			if (entity != null && entity.getId() != null) {
+				DcsbEntity de = dcsbService.findOne(entity.getId());
+				entity.setRecordStatus(de.getRecordStatus());
+			}
 			entity.setSsjyr(jyr);
 			entity.setSzgk(jyr.getSzgk());
 			entity.setSzgq(jyr.getSzgq());
@@ -194,10 +209,6 @@ public class DcsbWebService extends BaseWebCtl {
 		try {
 			AuthHandler.setCurrentUser(securityMgr.userService().findById(userId));
 			entity = dcsbService.submit(entity);
-			if (entity.getHwzl().getId().equals(entity.getHwzldedl().getId())) {
-				entity.setHwzldedl(null);
-				dcsbService.save(entity);
-			}
 		} catch (Exception e) {
 			e.printStackTrace();
 			return false;
@@ -215,14 +226,21 @@ public class DcsbWebService extends BaseWebCtl {
 		if ((dcsbService.getTaskByUserAndBusKey(userEntity.getId().toString(), dcsbId) == null) && dcsbService.getCandidateTaskByUserAndBusKey(userEntity.getId().toString(), dcsbId) != null) {
 			dcsbService.claim(dcsbId, SecUtils.getCurrUser().getId().toString());
 		}
-		if (dcsbService.getTaskByUserAndBusKey(userEntity.getId().toString(), dcsbId) != null) {
-			DcsbEntity entity = dcsbService.findOne(dcsbId);
-			entity.setShyj(shyj);
-			entity.setShsj(new Date());
-			entity.setShr(userEntity.getName());
-			return dcsbService.changeAudit(shyj, entity, flag);
+		// if (dcsbService.getTaskByUserAndBusKey(userEntity.getId().toString(),
+		// dcsbId) != null) {
+		DcsbEntity entity = dcsbService.findOne(dcsbId);
+		entity.setShyj(shyj);
+		entity.setShsj(new Date());
+		entity.setShr(userEntity.getName());
+		try {
+			dcsbService.changeAudit(shyj, entity, flag);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return false;
 		}
-		return false;
+		return true;
+		// }
+		// return false;
 	}
 
 	/**
@@ -337,4 +355,15 @@ public class DcsbWebService extends BaseWebCtl {
 		return ue;
 	}
 
+	/**
+	 * 根据用户名查询用户信息
+	 * 
+	 * @param userId
+	 * @return
+	 */
+	public UserEntity findUserByName(String userName) {
+		UserEntity ue = securityMgr.userService().findByUname(userName);
+		return ue;
+	}
+
 }