multi-common/src/main/java/com/gkhy/exam/common/domain/entity/SysUser.java

@@ -98,7 +98,7 @@
    private Long companyId;

    @NotBlank(message = "密码不能为空")
    @Length(min = 2,  message = "密码长度不正确")
    @Length(min = 6,  message = "密码长度不正确")
    @ApiModelProperty(value = "密码",required = true)
    @TableField("password")
    private String password;

 multi-system/src/main/java/com/gkhy/exam/system/domain/vo/IndexDataRep.java

@@ -11,6 +11,6 @@
    private String title;
    @ApiModelProperty(value = "数据id")
    private String dataId;
    @ApiModelProperty(value = "数据类型1内审实施计划2培训计划3项目评审4年度检定计划5用章审批(申请)6用章审批(审批)")
    @ApiModelProperty(value = "数据类型1内审实施计划2培训计划3项目评审4年度检定计划5用章审批(申请)6用章审批(审批)7颁布令")
    private String type;
}

 multi-system/src/main/java/com/gkhy/exam/system/service/impl/StandardizedTemplateServiceImpl.java

@@ -213,7 +213,7 @@
        //部门
        SysDept sysDept = new SysDept();
        sysDept.setCompanyId(companyId.longValue());
        sysDept.setResponsType("1");
//        sysDept.setResponsType("1");
        List<TreeSelect> treeSelects = iSysDeptService.selectDeptTreeList(sysDept);

        //公司概况

 multi-system/src/main/java/com/gkhy/exam/system/service/impl/SysUserServiceImpl.java

@@ -254,7 +254,13 @@
        checkRequestData(user);
        checkUserAllowed(user);
        user.setUpdateBy(SecurityUtils.getUsername());
        user.setPassword(null);

        if(StringUtils.isNotEmpty(user.getPassword())){
            user.setPassword(SecurityUtils.encryptPassword(Base64.decodeStr(user.getPassword())));
        }else {
            user.setPassword(null);
        }

        int row = baseMapper.updateById(user);
        batchSaveRole(user.getRoles(), user.getId(), true);


 multi-system/src/main/resources/mapper/system/MemoMapper.xml

@@ -63,5 +63,13 @@
        WHERE a.del_flag = 0
        AND (a.next_check = #{userId} )
        AND a.`status` = 1 and a.company_id = #{companyId}
        UNION ALL
        SELECT  concat(DATE(a.create_time),'，您有新的颁布审批请查看手机端小程序!') as title,
        '7' AS type,
        a.id AS dataId
        FROM proclaim a
        WHERE a.del_flag = 0
        AND a.check_id = #{userId}
        AND a.`status` = 0 and a.company_id = #{companyId}
    </select>
</mapper>