commit

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushZgAuditController.java

@@ -210,11 +210,11 @@ public class TeacherCongressDelegatePushZgAuditController {
     @SaCheckPermission("tc.delegate.push.zcAudit")
     @SLog(tag = "代表管理-代表资格审查", msg = "审查通过")
     public Result submit(@Param("data") String param, @Valid String id) {
-
+        Dict args = Json.fromJson(Dict.class, param);
         TeacherCongressDelegatePush delegatePush = baseService.dao().fetch(TeacherCongressDelegatePush.class, id);
         View_user user = baseService.dao().fetch(View_user.class, Cnd.where("id", "=", delegatePush.getUserId()));
 
-        if (delegatePush.getIsJdh()) {
+        if (delegatePush.getIsJdh() && args.getInt("submitType") == 1) {
             Teacher_congress_delegate delegate = new Teacher_congress_delegate();
             Sys_user_role userRole = new Sys_user_role();
 
@@ -263,13 +263,12 @@ public class TeacherCongressDelegatePushZgAuditController {
                     Cnd.where(Sys_user::getId, "=", user.getId())
             );
         }
-        Dict args = Json.fromJson(Dict.class, param);
+
         flowCommonService.executeTask(args);
         return Result.success();
     }
 
 
-
     @At
     @ApiOperation("批量审查")
     @Aop(TransAop.READ_COMMITTED)

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpMineController.java

@@ -7,6 +7,7 @@ import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.base.utils.PageUtil;
 import com.budwk.app.flow.engine.FlowEngine;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.zhgh.staffbenefit.difficulthelp.models.DifficultHelpInfo;
 import com.budwk.app.zhgh.staffbenefit.difficulthelp.service.DifficultHelpCommonService;
 import com.budwk.app.zhgh.staffbenefit.difficulthelp.vo.DifficultHelpPageParam;
@@ -17,6 +18,7 @@ import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
 import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
 import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
@@ -99,6 +101,7 @@ public class DifficultHelpMineController {
                 """);
         Cnd cnd = Cnd.NEW();
         pageParam.buildSearch(cnd, "info.");
+        cnd.and("info.createdBy", "=", SecurityUtil.getUserId());
         if (StrUtil.isAllBlank(pageParam.getPageOrderName(), pageParam.getPageOrderBy())) {
             cnd.desc("info.applyTime");
         } else {

src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberInfoServiceImpl.java

@@ -138,9 +138,9 @@ public class MemberInfoServiceImpl extends BaseServiceImpl<Sys_user> implements
                 """);
         Cnd cnd = Cnd.NEW();
         if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
-            cnd.and("u.unionId","=", SecurityUtil.getUnionId());
+            cnd.and("u.unionId", "=", SecurityUtil.getUnionId());
         } else {
-            cnd.andEX("u.unionId","=", pageForm.getUnionId());
+            cnd.andEX("u.unionId", "=", pageForm.getUnionId());
         }
         cnd.andEX("mh.unitId", "=", pageForm.getUnitId());
         cnd.andEX("mh.`year`", "=", pageForm.getYear());
@@ -168,7 +168,7 @@ public class MemberInfoServiceImpl extends BaseServiceImpl<Sys_user> implements
      */
     @Override
     @Aop(TransAop.READ_COMMITTED)
-    public void archiveMember(Integer year) throws RuntimeException{
+    public void archiveMember(Integer year) throws RuntimeException {
         dao().clear(MemberHistory.class, Cnd.where("`year`", "=", year));
         List<Sys_user> userList = dao().query(Sys_user.class, Cnd.where("member", "=", true));
 
@@ -245,7 +245,7 @@ public class MemberInfoServiceImpl extends BaseServiceImpl<Sys_user> implements
         List<NutMap> list = listMap(sql);
         for (NutMap row : list) {
             row.put("mobile", DesensitizedUtil.mobilePhone(row.getString("mobile")));
-            row.put("idCard",DesensitizedUtil.idCardNum(row.getString("idCard"), 3, 4));
+            row.put("idCard", DesensitizedUtil.idCardNum(row.getString("idCard"), 3, 4));
         }
 
         Workbook workbook = null;
@@ -349,11 +349,12 @@ public class MemberInfoServiceImpl extends BaseServiceImpl<Sys_user> implements
                 //重新设置
                 user.setId(R.UU32());
                 user.setSalt(R.UU32());
-                user.setPassword(PwdUtil.getPassword(PwdUtil.generate(12),user.getSalt()));
+                user.setPassword(PwdUtil.getPassword(PwdUtil.generate(12), user.getSalt()));
                 user.setLoginCount(0);
                 needInsertUser.add(user.getLoginname());
             }
             //设置excel列的数据
+            user.setLoginname(v.getLoginname());
             user.setUsername(v.getUsername());
             if (StrUtil.isNotBlank(v.getSex())) {
                 user.setSex(v.getSex());
@@ -378,9 +379,9 @@ public class MemberInfoServiceImpl extends BaseServiceImpl<Sys_user> implements
 
 
         if (Lang.isNotEmpty(insertOrUpdateUserList)) {
-            manyAddOrRenewUtil.asyncExecuteInsertOrUpdate(insertOrUpdateUserList,200);
+            manyAddOrRenewUtil.asyncExecuteInsertOrUpdate(insertOrUpdateUserList, 200);
 
-            dao().clear(Sys_user_role.class, Cnd.where("roleId","=", memberRole.getId()));
+            dao().clear(Sys_user_role.class, Cnd.where("roleId", "=", memberRole.getId()));
 
             //新增用户赋值普通角色
             if (Lang.isNotEmpty(needInsertUser)) {
@@ -397,7 +398,7 @@ public class MemberInfoServiceImpl extends BaseServiceImpl<Sys_user> implements
                     sysUserRole.setRoleId(publicRole.getId());
                     return sysUserRole;
                 }).collect(Collectors.toList());
-                manyAddOrRenewUtil.asyncExecuteInsert(newUserRoles,200);
+                manyAddOrRenewUtil.asyncExecuteInsert(newUserRoles, 200);
             }
 
             //根据用户表的member添加会员角色
@@ -413,7 +414,7 @@ public class MemberInfoServiceImpl extends BaseServiceImpl<Sys_user> implements
                 sysUserRole.setRoleId(memberRole.getId());
                 return sysUserRole;
             }).toList();
-            manyAddOrRenewUtil.asyncExecuteInsert(memberUserRoles,200);
+            manyAddOrRenewUtil.asyncExecuteInsert(memberUserRoles, 200);
         }
 
         //如果有错误数据就返回给前端
@@ -431,7 +432,6 @@ public class MemberInfoServiceImpl extends BaseServiceImpl<Sys_user> implements
     }
 
 
-
     public String getUnitId(Map<String, String> codeMap, Map<String, String> nameMap, String code, String name) {
         if (StrUtil.isNotBlank(code) && StrUtil.isNotBlank(name) || (StrUtil.isNotBlank(code) && StrUtil.isBlank(name))) {
             return codeMap.get(code);

src/main/resources/views/platform/zhgh/democratic/proposal/senior/feedback/index.html

@@ -141,18 +141,6 @@ layout("/layouts/platform.html"){
                                 placeholder="请输入您的办理意见"
                         ></el-input>
                     </el-descriptions-item>
-                    <el-descriptions-item label="通讯地址" :span="2">
-                        <el-input v-model="task.taskFormData.tf_address" placeholder="请输入通讯地址"
-                                  clearable></el-input>
-                    </el-descriptions-item>
-                    <el-descriptions-item label="联系电话" :span="2">
-                        <el-input v-model="task.taskFormData.tf_phone" placeholder="请输入联系电话"
-                                  clearable></el-input>
-                    </el-descriptions-item>
-                    <el-descriptions-item label="邮政编码" :span="2">
-                        <el-input v-model="task.taskFormData.tf_postcode" placeholder="请输入邮政编码"
-                                  clearable></el-input>
-                    </el-descriptions-item>
                 </el-descriptions>
             </template>
             <el-row type="flex" justify="end" slot="footer">

src/main/resources/views/platform/zhgh/democratic/proposal/transact/seconded/index.html

@@ -23,8 +23,8 @@ layout("/layouts/platform.html"){
         <el-card shadow="never">
             <table-tool :columns.sync="tableColumns">
                 <el-radio-group v-model="pageForm.approval" size="small" @change="doSearch">
-                    <el-radio-button :label="true">已审核</el-radio-button>
+                    <el-radio-button :label="true">已附议</el-radio-button>
-                    <el-radio-button :label="false">未审核</el-radio-button>
+                    <el-radio-button :label="false">未附议</el-radio-button>
                 </el-radio-group>
             </table-tool>
             <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
@@ -54,7 +54,7 @@ layout("/layouts/platform.html"){
                 <el-table-column label="操作" fixed="right" width="300px">
                     <template slot-scope="{row}">
                         <el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
-                        <el-button v-if="row.taskState === 10" @click="openAudit(row)" size="mini" type="primary">审核
+                        <el-button v-if="row.taskState === 10" @click="openAudit(row)" size="mini" type="primary">附议
                         </el-button>
 <!--                        <el-button v-if="row.canRevoke" @click="onRevoke(row)" size="mini" type="danger">撤回-->
 <!--                        </el-button>-->

src/main/resources/views/platform/zhgh/democratic/teachercongress/delegation/tree.js

@@ -41,6 +41,7 @@ const TREE_TEMPLATE = {
     watch: {
         sessionId(val) {
             this.$emit("session-change", val)
+            this.listTree()
         }
     },
     methods: {