Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-api-cloud

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSpuMapper.xml

@@ -64,6 +64,7 @@
         es.create_time,
         es.sales_count,
         es.dept_id,
+        es.create_by,
         u.unit,
         u.spec,
         u.retail_price,

pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyOAth2Cotroller.java

@@ -212,6 +212,7 @@ public class ThirdPartyOAth2Cotroller {
             userDTO.setNickname(zzdUserDTO.getUsername());
             userDTO.setSystemType("2");
             userDTO.setPhone(mobile);
+            userDTO.setCreateBy("诗画自动创建");
             //赋予随机密码
             userDTO.setPassword("pj*"+ UUID.randomUUID());
             R<Boolean> booleanR = remoteUserService.registerUser(userDTO);

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java

@@ -142,20 +142,24 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         BeanUtils.copyProperties(userDto, sysUser);
         // 判断是否为部门管理员
         PjcloudUser applyUser = SecurityUtils.getUser();
-        boolean isDeptAdmin = sysRoleService.isDeptAdmin(applyUser.getId());
-        if (isDeptAdmin) {
-            List<SysRole> defaultRoles = sysRoleService.findRolesByCodes(List.of(CommonRoleConstant.DEFAULT_USER, CommonRoleConstant.AUTO_CREATE_WALLET));
-            if (ObjectUtil.isEmpty(defaultRoles)) {
-                userDto.setRole(null);
+        boolean isDeptAdmin=false;
+        if (null!=applyUser){
+            isDeptAdmin = sysRoleService.isDeptAdmin(applyUser.getId());
+            if (isDeptAdmin) {
+                List<SysRole> defaultRoles = sysRoleService.findRolesByCodes(List.of(CommonRoleConstant.DEFAULT_USER, CommonRoleConstant.AUTO_CREATE_WALLET));
+                if (ObjectUtil.isEmpty(defaultRoles)) {
+                    userDto.setRole(null);
+                } else {
+                    userDto.setRole(defaultRoles.stream().map(SysRole::getRoleId).toList());
+                }
+                userDto.setDeptIds(null);
+                sysUser.setProcessStatus(TaskCheckStatusEnum.PADDING.getCode());
             } else {
-                userDto.setRole(defaultRoles.stream().map(SysRole::getRoleId).toList());
+                sysUser.setProcessStatus(TaskCheckStatusEnum.RESULT.getCode());
+                sysUser.setProcessTime(LocalDateTime.now());
             }
-            userDto.setDeptIds(null);
-            sysUser.setProcessStatus(TaskCheckStatusEnum.PADDING.getCode());
-        } else {
-            sysUser.setProcessStatus(TaskCheckStatusEnum.RESULT.getCode());
-            sysUser.setProcessTime(LocalDateTime.now());
         }
+
         sysUser.setLockFlag(StrUtil.isBlank(userDto.getLockFlag()) ? UserStateEnum.NORMAL.getCode() : userDto.getLockFlag());
         sysUser.setCreateBy(userDto.getUsername());
         sysUser.setUpdateBy(userDto.getUsername());