111

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/controller/IncidentTicketController.java

@@ -148,19 +148,23 @@ public class IncidentTicketController {
 				o.setNoticerUser(result);
 			}
 
-			//1未处理 2已通知 3通知已反馈 4已推送 5已完结
+			//1未处理 2已通知 3通知已反馈 4已推送 5已完结（提交） 6已完结
 			List<IncidentTicketChildren> list = incidentTicketChildrenService.selectByMainId(o.getId());
-			if(o.getState().equals("4") || o.getState().equals("5")){
+			if(!o.getState().equals("1") && !o.getState().equals("2") && !o.getState().equals("3")){
 				String result = list.stream().map(IncidentTicketChildren::getU8Invoice).collect(Collectors.joining(","));
 				if(StringUtils.isNotBlank(result) && !result.equals("null")){
 					o.setU8Invoices(result);
 				}
 			}
 //			String result2 = list.stream().map(IncidentTicketChildren::getZhanghaoId).collect(Collectors.joining(","));
-			String result2 = list.get(0).getZhanghaoId();
-			if(StringUtils.isNotBlank(result2) && !result2.equals("null")){
-				o.setAcSetNo(result2);
+
+			if(list.size() > 0){
+				String result2 = list.get(0).getZhanghaoId();
+				if(StringUtils.isNotBlank(result2) && !result2.equals("null")){
+					o.setAcSetNo(result2);
+				}
 			}
+
 			if(StringUtils.isNotBlank(o.getResponsibilityPerson1())){
 				LoginUser login = sysBaseAPI.getUserByName(o.getResponsibilityPerson1());
 				if(login != null){

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/entity/IncidentTicket.java

@@ -222,7 +222,7 @@ public class IncidentTicket implements Serializable {
 	@Excel(name = "子表控件", width = 15)
     @ApiModelProperty(value = "子表控件")
     private String tableNameChildren;
-	/**1未处理 2已通知 3通知已反馈 4已推送 5已完结*/
+	/**1未处理 2已通知 3通知已反馈 4已推送 5已完结（提交） 6已完结*/
 	@Excel(name = "1未处理 2已通知 3通知已反馈 4已推送 5已完结", width = 15)
     @ApiModelProperty(value = "1未处理 2已通知 3通知已反馈 4已推送 5已完结")
     private String state;

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -173,8 +173,10 @@ public class SysUserController {
 									  @RequestParam(name="pageSize", defaultValue="300") Integer pageSize,HttpServletRequest req) {
 		Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
 //		String deptName = user.getDeptName();
-		String[] deptName = {"人事","财务一部"};//user.getDeptName();
+//		String[] deptName = {"人事","财务一部"};//user.getDeptName();
+		String[] deptCode = {"TOD01","TFD01"};//
         user.setDeptName(null);
+        user.setDeptCode(null);
 
         String syHireType = user.getSyHireType();
         user.setSyHireType(null);
@@ -187,9 +189,9 @@ public class SysUserController {
         queryWrapper.last("and realname !='崔崇杰' and IFNULL(sy_Hire_Type,'在职') !='离职' order by substring_index(work_no, '-', 1) + 0 asc,work_no asc");
 
         List<String> deptList = new ArrayList<>();
-        for(String o:deptName){
+        for(String o:deptCode){
             SysUser user2 = new SysUser();
-            user2.setDeptName(o);
+            user2.setDeptCode(o);
             List<SysUser> aa = sysUserMapper.selectUserInfo("T",user2);
 
             for(SysUser a:aa){

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUser.java

@@ -344,6 +344,9 @@ public class SysUser implements Serializable {
     @TableField(exist = false)
     private java.lang.String deptName;//临时字段，存放部门名称
 
+    @TableField(exist = false)
+    private java.lang.String deptCode;//临时字段，存放部门名称
+
     /**社保断缴日期*/
     @Excel(name = "社保断缴日期", width = 20, format = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml

@@ -167,6 +167,9 @@
 			<if test="userParams.deptName != null and userParams.deptName != ''">
 				AND c.depart_name LIKE '%${userParams.deptName}%'
 			</if>
+			<if test="userParams.deptCode != null and userParams.deptCode != ''">
+				AND c.org_code LIKE '%${userParams.deptCode}%'
+			</if>
 		</if>
 		group by a.username,a.realname
 		order by substring_index(work_no, '-', 1) + 0 ASC,work_no