Quellcode durchsuchen

人员编辑不去保存合伙人工作室信息

helixiao vor 1 Jahr
Ursprung
Commit
fcf615d5e6

+ 14 - 8
src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -562,12 +562,18 @@ public class SysUserController extends BaseController {
         SysUser sysUser = sysUserService.getById(userId);
         if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_2.getCode())) {
             sysUser.setStatus(UserWorkStatus.UWS_1.getCode());
+            sysUserService.addInfo(sysUser);
         } else if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_4.getCode())) {
             sysUser.setStatus(UserWorkStatus.UWS_0.getCode());
+
         } else if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_6.getCode())) {
             sysUser.setStatus(UserWorkStatus.UWS_1.getCode());
         }
-        return HttpResult.ok(sysUserService.addInfo(sysUser));
+        SysUserTrack sysUserTrack = new SysUserTrack(sysUser);
+
+        sysUserTrackService.save(sysUserTrack);
+
+        return HttpResult.ok("审批成功");
     }
 
 
@@ -582,6 +588,13 @@ public class SysUserController extends BaseController {
         SysUser sysUser = sysUserService.getById(userId);
         if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_2.getCode())) {
             sysUser.setStatus(UserWorkStatus.UWS_3.getCode());
+            Integer type = sysUser.getType();
+            Integer level = sysUser.getLevel();
+            if (type != 0) {
+                if (level == null || level != 1) {
+                    sysUserService.sendMsgPantner(sysUser.getMobile());
+                }
+            }
         } else if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_4.getCode())) {
             sysUser.setStatus(UserWorkStatus.UWS_5.getCode());
         } else if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_6.getCode())) {
@@ -591,13 +604,6 @@ public class SysUserController extends BaseController {
         SysUserTrack sysUserTrack = new SysUserTrack(sysUser);
         sysUserTrack.setApproveMess(reason);
         sysUserTrackService.save(sysUserTrack);
-        Integer type = sysUser.getType();
-        Integer level = sysUser.getLevel();
-        if (type != 0) {
-            if (level == null || level != 1) {
-                sysUserService.sendMsgPantner(sysUser.getMobile());
-            }
-        }
 
         return HttpResult.ok(sysUserService.updateById(sysUser));
 

+ 0 - 2
src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -2388,9 +2388,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean addInfo(SysUser sysUser) {
-        SysUserTrack sysUserTrack = new SysUserTrack(sysUser);
 
-        sysUserTrackService.save(sysUserTrack);
         Integer type = sysUser.getType();
         if (type == 1) {
             SysPartner sysPartner = sysPartnerMapper.selectOne(new LambdaQueryWrapper<SysPartner>().eq(SysPartner::getUserId, sysUser.getId()));