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

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

@@ -178,12 +178,9 @@ 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())){
-				if(StringUtils.isEmpty(entity.getHwzldedl().getId())){
-					CodeEntity code = securityMgr.codeService().findOne(entity.getHwzl().getId());
-					entity.setHwzldedl(code);
-				}
-				
+			if (StringUtils.isEmpty(entity.getHwzldedl())) {
+				CodeEntity code = securityMgr.codeService().findOne(entity.getHwzl().getId());
+				entity.setHwzldedl(code);
 			}
 			if (jyr == null) {
 				return false;
@@ -197,7 +194,7 @@ public class DcsbWebService extends BaseWebCtl {
 		try {
 			AuthHandler.setCurrentUser(securityMgr.userService().findById(userId));
 			entity = dcsbService.submit(entity);
-			if(entity.getHwzl().getId()==entity.getHwzldedl().getId()){
+			if (entity.getHwzl().getId().equals(entity.getHwzldedl().getId())) {
 				entity.setHwzldedl(null);
 				dcsbService.save(entity);
 			}