Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/assets/mixins/formdialog.js

@@ -127,7 +127,11 @@ export default {
       const dataCopy = Object.assign({}, data);
       array.forEach((item) => {
         dataCopy[item] =
-          dataCopy[item] === undefined ? [] : dataCopy[item].split(",");
+          dataCopy[item] === undefined
+            ? []
+            : Array.isArray(dataCopy[item])
+            ? dataCopy[item]
+            : dataCopy[item].split(",");
       });
       return dataCopy;
     },

attendance-performance-manager-ui/admin/src/views/system/user/list.vue

@@ -298,7 +298,7 @@ export default {
           {
             prop: "roleIds",
             label: "所属角色",
-            formatter: this.formatters,
+            formatter: this.formatter,
             align: "center",
           },
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java

@@ -170,8 +170,8 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
                     }
                     staffEntity.setName(personInfo.getPersonName());
                     staffEntity.setRemarkId(personInfo.getPersonId());
-                    staffEntity.setPicUri(personInfo.getPersonPhoto().getPicUri());
-                    staffEntity.setServerIndexCode(personInfo.getPersonPhoto().getServerIndexCode());
+                    staffEntity.setPicUri(personInfo.getPersonPhoto()==null?"":personInfo.getPersonPhoto().getPicUri());
+                    staffEntity.setServerIndexCode(personInfo.getPersonPhoto()==null?"":personInfo.getPersonPhoto().getServerIndexCode());
                     staffEntity.setDeptName(personInfo.getOrgName());
                     staffEntity.setGender(personInfo.getGender());
                     staffEntity.setWorkNum(personInfo.getJobNo());
@@ -187,8 +187,8 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
                     }
                     staffEntity.setName(personInfo.getPersonName());
                     staffEntity.setRemarkId(personInfo.getPersonId());
-                    staffEntity.setPicUri(personInfo.getPersonPhoto().getPicUri());
-                    staffEntity.setServerIndexCode(personInfo.getPersonPhoto().getServerIndexCode());
+                    staffEntity.setPicUri(personInfo.getPersonPhoto()==null?"":personInfo.getPersonPhoto().getPicUri());
+                    staffEntity.setServerIndexCode(personInfo.getPersonPhoto()==null?"":personInfo.getPersonPhoto().getServerIndexCode());
                     staffEntity.setDeptName(personInfo.getOrgName());
                     staffEntity.setGender(personInfo.getGender());
                     staffEntity.setWorkNum(personInfo.getJobNo());