commit

src/main/java/com/budwk/app/flow/service/FlowCommonService.java

@@ -36,7 +36,7 @@ public class FlowCommonService {
         args.put(FlowConst.TASK_FORM_DATA_PREFIX + "userName", SecurityUtil.getUserUsername());
         args.put(FlowConst.TASK_FORM_DATA_PREFIX + "loginName", SecurityUtil.getUserLoginname());
         args.put(FlowConst.TASK_FORM_DATA_PREFIX + "unitId", SecurityUtil.getUnitId());
-        args.put(FlowConst.TASK_FORM_DATA_PREFIX + "unitName", SecurityUtil.getUnitId());
+        args.put(FlowConst.TASK_FORM_DATA_PREFIX + "unitName", SecurityUtil.getUnitName());
         args.put(FlowConst.TASK_FORM_DATA_PREFIX + "unionId", SecurityUtil.getUnionId());
 
         if (ObjectUtil.equals(submitType, ProcessSubmitTypeEnum.ROLLBACK.getCode())) {

src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java

@@ -395,6 +395,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Sys_user> implements Sys
                 .set("loginname", Strings.sNull(user.getLoginname()))
                 .set("username", Strings.sNull(user.getUsername()))
                 .set("unitId", Strings.sNull(user.getUnitId()))
+                .set("unitName", Strings.sNull(user.getUnit().getName()))
                 .set("unitPath", Strings.sNull(user.getUnitPath()))
                 .set("unionId", ObjectUtil.isEmpty(user.getUnion()) ? "" : user.getUnion().getId())
                 .set("unionGroupId", Strings.sNull(viewUser.getUnionGroupId()))

src/main/java/com/budwk/app/web/commons/auth/utils/SecurityUtil.java

@@ -40,6 +40,10 @@ public class SecurityUtil {
         return Strings.sNull(getSession().get("unitId"));
     }
 
+    public static String getUnitName() {
+		return Strings.sNull(getSession().get("unitName"));
+	}
+
     /**
      * 获取当前用户工会ID
      */

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalMineController.java

@@ -215,14 +215,15 @@ public class ProposalMineController {
                 SELECT
                 	t1.loginName,
                 	t1.userName,
-                	t1.sex,
+                	ifnull(t1.sex, u.sex) AS sex,
                 	t1.unitName,
                 	t1.unionName,
-                	t1.mobile,
+                	ifnull(t1.mobile, u.mobile) AS mobile,
                 	t2.NAME AS delegationName
                 FROM
                 	teacher_congress_delegate t1
                 	LEFT JOIN teacher_congress_delegation t2 ON t2.id = t1.delegationId
+                	LEFT JOIN vw_user u ON u.id = t1.userId
                 $condition
                 """);
         Cnd cnd = Cnd.where("t1.sessionId", "=", sessionId);
@@ -281,14 +282,15 @@ public class ProposalMineController {
                     t1.userId,
                 	t1.loginName,
                 	t1.userName,
-                	t1.sex,
+                	ifnull(t1.sex, u.sex) AS sex,
                 	t1.unitName,
                 	t1.unionName,
-                	t1.mobile,
+                	ifnull(t1.mobile, u.mobile) AS mobile,
                 	t2.NAME AS delegationName
                 FROM
                 	teacher_congress_delegate t1
                 	LEFT JOIN teacher_congress_delegation t2 ON t2.id = t1.delegationId
+                	LEFT JOIN vw_user u ON u.id = t1.userId
                 $condition
                 """);
         sql.setCondition(Cnd.where("t1.loginName", "in", seconders).groupBy("t1.loginName"));

src/main/java/com/budwk/app/zhgh/democratic/proposal/param/ProposalQueryComprehensiveParam.java

@@ -71,7 +71,13 @@ public class ProposalQueryComprehensiveParam extends PageForm {
             cnd = Cnd.NEW();
         }
         //教代会届次
-        cnd.andEX("info.sessionId", "=", searchParam.getSessionId());
+		SqlExpressionGroup expressionGroup = new SqlExpressionGroup();
+		expressionGroup.orEX("info.sessionId", "=", searchParam.getSessionId());
+		expressionGroup.orEX("info.sessionId", "in", searchParam.getSessionIds());
+		if(!expressionGroup.isEmpty()){
+			cnd.and(expressionGroup);
+		}
+
         //提案名称
         if (StrUtil.isNotBlank(searchParam.getName())) {
             cnd.where().andLike("info.name", searchParam.getName());