|
@@ -175,9 +175,16 @@ public class DcsbWebService extends BaseWebCtl {
|
|
|
return list.getContent();
|
|
|
}
|
|
|
|
|
|
- public boolean submit(DcsbEntity entity,String userId) {
|
|
|
+ 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 (jyr == null) {
|
|
|
return false;
|
|
|
}
|
|
@@ -190,6 +197,10 @@ public class DcsbWebService extends BaseWebCtl {
|
|
|
try {
|
|
|
AuthHandler.setCurrentUser(securityMgr.userService().findById(userId));
|
|
|
entity = dcsbService.submit(entity);
|
|
|
+ if(entity.getHwzl().getId()==entity.getHwzldedl().getId()){
|
|
|
+ entity.setHwzldedl(null);
|
|
|
+ dcsbService.save(entity);
|
|
|
+ }
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
return false;
|