后台登录

admin/src/main/java/com/huimv/farm/damsubsidy/controller/BaseVeterStationController.java

@@ -18,6 +18,7 @@ import java.util.Map;
  * @author author
  * @since 2023-05-05
  */
+@CrossOrigin
 @RestController
 @RequestMapping("/base-veter-station")
 public class BaseVeterStationController {

admin/src/main/java/com/huimv/farm/damsubsidy/controller/SysUserController.java

@@ -258,13 +258,13 @@ public class SysUserController {
     @PostMapping("/listSubordinate")
     public Result listSubordinate(@RequestBody Map map , HttpServletRequest request) {
         Long userId = TokenSign.getMemberIdByJwtToken(request);
-        String pageNum = (String) map.get("pageNum");
-        String pageSize = (String) map.get("pageSize");
+        Integer pageNum = (Integer) map.get("pageNum");
+        Integer pageSize = (Integer) map.get("pageSize");
         if (StringUtils.isEmpty(pageNum)){
-            pageNum ="1";
+            pageNum =1;
         }
         if (StringUtils.isEmpty(pageSize)){
-            pageSize ="10";
+            pageSize =10;
         }
         String searchStr = (String) map.get("searchStr");
         return iSysUserService.listSubordinate(searchStr,pageNum,pageSize,userId);

admin/src/main/java/com/huimv/farm/damsubsidy/mapper/AccountGroupMapper.java

@@ -16,5 +16,5 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface AccountGroupMapper extends BaseMapper<AccountGroup> {
 
-    void removeAccountGroup(@Param("groupIds") String groupIds);
+    void removeAccountGroup(@Param("accountId") String accountId);
 }

admin/src/main/java/com/huimv/farm/damsubsidy/service/ISysUserService.java

@@ -43,7 +43,7 @@ public interface ISysUserService extends IService<SysUser> {
 
     List<Long> getAllChildId(Long userId);
 
-    Result listSubordinate(String searchStr, String pageNum, String pageSize, Long userId);
+    Result listSubordinate(String searchStr, Integer pageNum, Integer pageSize, Long userId);
 
     Result getLastFarmId(Integer userId);
 

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/AuthorizeServiceImpl.java

@@ -38,27 +38,20 @@ public class AuthorizeServiceImpl implements IAuthorizeService {
          * Step1:先删除原先的账号关联权限组数据；
          * Step2:再添加新的账号关联权限组数据；
          */
-        if (accountId == null||"".equals(accountId)){
+        String[] groupIdArray = groupIds.split(",");
+        accountGroupMapper.removeAccountGroup(accountId);
 
-            accountGroupMapper.removeAccountGroup(groupIds);
-            return new Result(10001, "保存账号关联权限组成功", true);
-        }else {
-            String[] groupIdArray = accountId.split(",");
-            accountGroupMapper.removeAccountGroup(groupIds);
 //        for (int a = 0; a < groupIdArray.length; a++) {
 //            accountGroupMapper.removeAccountGroup(accountId,groupIdArray[a]);
 //        }
-            for (int a = 0; a < groupIdArray.length; a++) {
-                AccountGroup accountGroupEntity = new AccountGroup();
-                accountGroupEntity.setAccountId(Integer.parseInt(groupIdArray[a]));
-                accountGroupEntity.setGroupId(Integer.parseInt(groupIds));
-                accountGroupMapper.insert(accountGroupEntity);
+        for (int a = 0; a < groupIdArray.length; a++) {
+            AccountGroup accountGroupEntity = new AccountGroup();
+            accountGroupEntity.setAccountId(Integer.parseInt(accountId));
+            accountGroupEntity.setGroupId(Integer.parseInt(groupIdArray[a]));
+            accountGroupMapper.insert(accountGroupEntity);
 //            accountGroupMapper.insert(Integer.parseInt(accountId),Integer.parseInt(groupIdArray[a]));
-            }
-            return new Result(10001, "保存账号关联权限组成功", true);
         }
-
-
+        return new Result(10001, "保存账号关联权限组成功", true);
     }
 
     @Override
@@ -103,6 +96,7 @@ public class AuthorizeServiceImpl implements IAuthorizeService {
         /* 根据权限组读取已关联菜单 */
         QueryWrapper<GroupMenu> groupMenuQueryWrapper = new QueryWrapper<>();
         groupMenuQueryWrapper.eq("group_id",groupId);
+
         List<GroupMenu> groupMenuEntityList = groupMenuMapper.selectList(groupMenuQueryWrapper);
         if (groupMenuEntityList.size() == 0) {
             return new Result(10005, "当前权限组暂未关联任何菜单.", false);

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/SysUserServiceImpl.java

@@ -113,6 +113,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         sysUser.setUpdateUser(userId+"");
         sysUser.setUserType(4);
         sysUser.setIsRealName(0);
+        sysUser.setAccoutType(1);
         sysUser.setPid(Math.toIntExact(userId));
         sysUser.setPids(byId.getPids() + "," + userId);
         this.save(sysUser);
@@ -386,7 +387,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
-    public Result listSubordinate(String searchStr, String pageNum, String pageSize, Long userId) {
+    public Result listSubordinate(String searchStr, Integer pageNum, Integer pageSize, Long userId) {
 
         QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
         wrapper.like("pids", userId);
@@ -396,7 +397,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             wrapper.like("user_name", searchStr);
         }
 
-        IPage<SysUser> page = this.page(new Page<SysUser>(Long.parseLong(pageNum), Long.parseLong(pageSize)), wrapper);
+        IPage<SysUser> page = this.page(new Page<SysUser>(Long.valueOf(pageNum), Long.valueOf(pageSize)), wrapper);
         return new Result(ResultCode.SUCCESS, page);
     }
 

admin/src/main/resources/com/huimv/farm/damsubsidy/mapper/AccountGroupMapper.xml

@@ -4,6 +4,6 @@
 
 
     <delete id="removeAccountGroup">
-        DELETE FROM sys_account_group WHERE group_id=#{groupIds}
+       DELETE FROM sys_account_group WHERE account_id=#{accountId}
     </delete>
 </mapper>