调整卡管理限制条件

ie-admin/src/main/java/com/ruoyi/web/controller/dz/DzCardsController.java

@@ -132,12 +132,12 @@ public class DzCardsController extends BaseController
     {
         SysUser sysUser = SecurityUtils.getLoginUser().getUser();
         DzAgent agent = agentService.selectDzAgentByAgentId(agentId);
-        if(UserTypeEnum.Agent.equals(sysUser.getUserType())) { // 代理商分配
+        if(UserTypeEnum.Agent.getVal().equals(sysUser.getUserType())) { // 代理商分配
             if (!sysUser.getUserTypeId().equals(agent.getParentId())) {
                 throw new ValidationException("只能分配给下级代理");
             }
             dzCardsService.assignCard(sysUser.getUserTypeId(), agentId, begin, end, location, examType, schoolId);
-        } else if(UserTypeEnum.Institution.equals(sysUser.getUserType())) { // 机构分配卡给自己的下级
+        } else if(UserTypeEnum.Institution.getVal().equals(sysUser.getUserType())) { // 机构分配卡给自己的下级
             if (!sysUser.getDeptId().equals(agent.getDeptId())) {
                 throw new ValidationException("只能分配给下级代理");
             }

ie-admin/src/main/java/com/ruoyi/web/controller/dz/DzCardsOpenController.java

@@ -54,7 +54,7 @@ public class DzCardsOpenController extends BaseController
     public TableDataInfo list(DzCardsOpen dzCardsOpen)
     {
         SysUser sysUser = SecurityUtils.getLoginUser().getUser();
-        if(UserTypeEnum.Agent.equals(sysUser.getUserType())) {
+        if(UserTypeEnum.Agent.getVal().equals(sysUser.getUserType())) {
             dzCardsOpen.setAgentId(sysUser.getUserTypeId());
         }
         startPage();
@@ -120,7 +120,7 @@ public class DzCardsOpenController extends BaseController
     {
         DzCardsOpen open = dzCardsOpenService.selectDzCardsOpenById(id);
         SysUser sysUser = SecurityUtils.getLoginUser().getUser();
-        if (UserTypeEnum.Agent.equals(sysUser.getUserType()) && !open.getAgentId().equals(sysUser.getUserId())) {
+        if (UserTypeEnum.Agent.getVal().equals(sysUser.getUserType()) && !open.getAgentId().equals(sysUser.getUserId())) {
             throw new ValidationException("不可修改他人申请");
         }
         if(RequestStatus.Accept.getVal().equals(open.getStatus())) {

ie-admin/src/main/java/com/ruoyi/web/controller/dz/DzSchoolController.java

@@ -6,9 +6,12 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.ValidationException;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.enums.UserTypeEnum;
 import com.ruoyi.system.domain.SysArea;
 import com.ruoyi.system.service.ISysAreaService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -86,6 +89,9 @@ public class DzSchoolController extends BaseController
     @GetMapping("/getCampusList")
     public AjaxResult getCampusList(DzSchool dzSchool)
     {
+        if(!UserTypeEnum.Sys.getVal().equals(SecurityUtils.getLoginUser().getUser().getUserType())) {
+            dzSchool.setCampus(true);
+        }
         List<DzSchool> list = dzSchoolService.selectDzSchoolList(dzSchool);
         return AjaxResult.success(list);
     }
@@ -93,6 +99,9 @@ public class DzSchoolController extends BaseController
     @GetMapping("/getSchoolList")
     public AjaxResult getSchoolList(DzSchool dzSchool)
     {
+        if(!UserTypeEnum.Sys.getVal().equals(SecurityUtils.getLoginUser().getUser().getUserType())) {
+            dzSchool.setCampus(false);
+        }
         List<DzSchool> list = dzSchoolService.selectDzSchoolList(dzSchool);
         return AjaxResult.success(list);
     }

ie-system/src/main/java/com/ruoyi/dz/domain/DzSchool.java

@@ -52,6 +52,8 @@ public class DzSchool extends BaseEntity
 
     private SysDept dept;
 
+    private Boolean campus;
+
     public String getProCityAreaName() {
         return proCityAreaName;
     }
@@ -148,6 +150,14 @@ public class DzSchool extends BaseEntity
         return status;
     }
 
+    public Boolean getCampus() {
+        return campus;
+    }
+
+    public void setCampus(Boolean campus) {
+        this.campus = campus;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ie-system/src/main/java/com/ruoyi/dz/service/impl/DzCardsServiceImpl.java

@@ -260,7 +260,7 @@ public class DzCardsServiceImpl implements IDzCardsService
     @Override
     public Boolean requestOpenCard(DzCardsOpen dzCardsOpen) {
         SysUser sysUser = SecurityUtils.getLoginUser().getUser();
-        if(UserTypeEnum.Agent.equals(sysUser.getUserType())) {
+        if(UserTypeEnum.Agent.getVal().equals(sysUser.getUserType())) {
             dzCardsOpen.setAgentId(sysUser.getUserTypeId());
         } else {
             dzCardsOpen.setAgentId(0L);
@@ -276,7 +276,7 @@ public class DzCardsServiceImpl implements IDzCardsService
     @Transactional(rollbackFor = Exception.class)
     public Boolean confirmOpenCard(DzCardsOpen dzCardsOpen, SysUser sysUser) {
         DzCardsOpen exist = dzCardsOpenMapper.selectDzCardsOpenById(dzCardsOpen.getId());
-        if(UserTypeEnum.Agent.equals(sysUser.getUserType()) && !exist.getAgentId().equals(dzCardsOpen.getAgentId())) {
+        if(UserTypeEnum.Agent.getVal().equals(sysUser.getUserType()) && !exist.getAgentId().equals(dzCardsOpen.getAgentId())) {
             throw new ValidationException("不可修改他人申请");
         }
         if(RequestStatus.Accept.getVal().equals(exist.getStatus())) {

ie-system/src/main/resources/mapper/dz/DzSchoolMapper.xml

@@ -49,7 +49,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="city != null "> and t1.city = #{city}</if>
             <if test="area != null "> and t1.area = #{area}</if>
             <if test="status != null "> and t1.status = #{status}</if>
+            <if test="campus != null and campus"> and t1.dept_id &gt; 0</if>
+            <if test="campus != null and not campus"> and (t1.dept_id = 0 or t1.dept_id is null)</if>
         </where>
+        order by t1.dept_id &gt; 0, t1.name
     </select>
 
     <select id="selectDzSchoolListByIds" resultMap="DzSchoolResult">