Merge remote-tracking branch 'origin/master'

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/useSeal/mapper/xml/SignetMapper.xml

@@ -166,7 +166,7 @@
             left join sys_office so on su.office_id=so.id
             left join act_ru_task art ON a.proc_ins_id = art.PROC_INST_ID_
             where (FIND_IN_SET(#{projectId},a.project_id) or a.project_id = #{projectId})
-                and a.type = (select dv.id from sys_dict_value dv where a.type=dv.id)
+                and a.type_status = 1
                 and a.status in ('5')
     </select>
 

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/modules/flowable/listener/JyProjectArchiveListener.java

@@ -84,15 +84,20 @@ public class JyProjectArchiveListener implements ExecutionListener {
                 String finalTitleName = titleName;
                 //获取市场部下的所有员工信息
                 OfficeDTO officeDTO = SpringUtil.getBean(IOfficeApi.class).getOfficeDTOByName("市场部");
-                List<UserDTO> listByOfficeId = SpringUtil.getBean(IUserApi.class).findListByOfficeId(officeDTO.getId());
-                for (UserDTO dto : listByOfficeId) {
-                    list.add(dto);
+                if (null != officeDTO && StringUtils.isNotBlank(officeDTO.getId())){
+
+                    List<UserDTO> listByOfficeId = SpringUtil.getBean(IUserApi.class).findListByOfficeId(officeDTO.getId());
+                    for (UserDTO dto : listByOfficeId) {
+                        list.add(dto);
+                    }
                 }
                 //获取总经理
                 RoleDTO roleDTO = SpringUtil.getBean(IRoleApi.class).getRoleDTOByName("总经理");
-                List<UserDTO> listByRoleId = SpringUtil.getBean(IUserApi.class).findListByRoleId(roleDTO.getId());
-                for (UserDTO dto : listByRoleId) {
-                    list.add(dto);
+                if (null != roleDTO && StringUtils.isNotBlank(roleDTO.getId())){
+                    List<UserDTO> listByRoleId = SpringUtil.getBean(IUserApi.class).findListByRoleId(roleDTO.getId());
+                    for (UserDTO dto : listByRoleId) {
+                        list.add(dto);
+                    }
                 }
                 //将项目信息抄送给分管领导
                 for (UserDTO dto : allUserInfo) {