Merge remote-tracking branch 'origin/master'

jp-console/jeeplus-modules/gw/src/main/java/com/jeeplus/circulation2/controller/GwCirculationCard2Controller.java

@@ -116,6 +116,9 @@ public class GwCirculationCard2Controller {
 				if(!state.equals("1")){
 					queryWrapper.eq ("b.state", state );
 				}
+				if(state.equals("4")){
+					queryWrapper.ne ("b.state", "1" );
+				}
 			}
 			queryWrapper.groupBy("a.id");
 

jp-console/jeeplus-modules/gw/src/main/java/com/jeeplus/gwflow/controller/GwFlowController.java

@@ -107,7 +107,7 @@ public class GwFlowController {
 		//新增或编辑表单保存
 		gwFlowService.saveOrUpdate (gwFlowWrapper.toEntity (gwFlowDTO));
 
-		//取当前角色,不是办公室管理员\办公室主任的时候两个角色的时候,处理完自己的需要新增一条待办人到办公室主任
+		//取当前角色,不是办公室管理员\办公室主任的时候两个角色的时候,处理完自己的需要新增一条待办人到办公室主任???????这边有疑问,先不新增(原因,多个审核人都提交会生成重复数据)
 		UserDTO userDTO=UserUtils.getCurrentUserDTO();
 		List<RoleDTO> list=userDTO.getRoleDTOList();
 		boolean isadmin=false;
@@ -116,20 +116,20 @@ public class GwFlowController {
 				isadmin=true;
 			}
 		}
-		if(isadmin){
-			//默认一条待办
-			GwFlowDTO a1=new GwFlowDTO();
-			a1.setGwId(gwFlowDTO.getGwId());
-			a1.setState("1");
-			UserDTO userDTO2=userService.getUserByLoginName("bgszr","10000");//////////////这边后期需要指定某个办公室主任
-			a1.setCreateBy(userDTO);
-			a1.setUpdateBy(userDTO2);
-			a1.setCreateTruename(userDTO.getName());
-			a1.setNextTruename(userDTO2.getName());
-			a1.setNextUser(userDTO2.getId());
-			a1.setWhich("1");
-			gwFlowService.saveOrUpdate (gwFlowWrapper.toEntity (a1));
-		}
+//		if(!isadmin){
+//			//默认一条待办
+//			GwFlowDTO a1=new GwFlowDTO();
+//			a1.setGwId(gwFlowDTO.getGwId());
+//			a1.setState("1");
+//			UserDTO userDTO2=userService.getUserByLoginName("bgszr","10000");//////////////这边后期需要指定某个办公室主任
+//			a1.setCreateBy(userDTO);
+//			a1.setUpdateBy(userDTO2);
+//			a1.setCreateTruename(userDTO.getName());
+//			a1.setNextTruename(userDTO2.getName());
+//			a1.setNextUser(userDTO2.getId());
+//			a1.setWhich("1");
+//			gwFlowService.saveOrUpdate (gwFlowWrapper.toEntity (a1));
+//		}
 
 		//此时是办公室主任选人后的操作
 		if(gwFlowDTO.getNext()!=null&&gwFlowDTO.getNext().equals("1")){