Merge remote-tracking branch 'cloud-schoolapi/ywx'

suser/src/main/java/com/xhkjedu/suser/controller/system/UsecretController.java

@@ -60,7 +60,7 @@ public class UsecretController {
     public ResultVo delete(@RequestBody TUsecret usecret) {
         Integer usid = usecret.getUsid();
         N_Utils.validation(new Object[]{usid, "密保问题id", 1});
-        return usecretService.deleteById(usid);
+        return usecretService.deleteById(usid, usecret.getSchoolid());
     }
 
     /**
@@ -72,8 +72,8 @@ public class UsecretController {
       */
     @PostMapping("/list")
     public ResultVo list(@RequestBody TUsecret usecret) {
-        N_Utils.validation(new Object[]{usecret.getPage(), "显示页码", 1, usecret.getPageSize(), "显示条数", 1, usecret.getSchoolid(), "学校id", 1});
-        PageHelper.startPage(usecret.getPage(),usecret.getPageSize());
+        N_Utils.validation(new Object[]{usecret.getPage(), "显示页码", 1, usecret.getPageSize(), "显示条数", 1});
+        PageHelper.startPage(usecret.getPage(), usecret.getPageSize());
         List<Map> list = usecretService.findAll(usecret);
         PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
         return new ResultVo(0,"获取列表成功",pageResult);
@@ -89,7 +89,6 @@ public class UsecretController {
     @PostMapping("/list_sel")
     public ResultVo listForSel(@RequestBody TUsecret usecret) {
         Integer schoolid = usecret.getSchoolid();
-        N_Utils.validation(new Object[]{schoolid, "学校id", 1});
         List<Map> list = usecretService.listForSel(schoolid);
         return new ResultVo(0,"获取列表成功",list);
     }

suser/src/main/java/com/xhkjedu/suser/mapper/system/UsecretMapper.java

@@ -14,5 +14,8 @@ public interface UsecretMapper extends TkMapper<TUsecret> {
     List<Map> findAll(@Param("usecret") TUsecret usecret);
 
     //获取密保问题选择列表
-    List<Map> listForSel(Integer schoolid);
+    List<Map> listForSel(@Param("schoolid") Integer schoolid);
+
+    //获取密保问题数量
+    Integer getNumBySchoolId(@Param("schoolid") Integer schoolid);
 }

suser/src/main/java/com/xhkjedu/suser/model/system/TUsecret.java

@@ -19,6 +19,9 @@ public class TUsecret extends BaseBean {
     //密保问题排序
     private Integer sorder;
 
+    //归属1平台3学校
+    private Integer belong;
+
     //创建人id
     private Integer createid;
 

suser/src/main/java/com/xhkjedu/suser/service/system/UsecretService.java

@@ -47,17 +47,21 @@ public class UsecretService {
     }
 
     /**
-      * 删除
-      * @param [usid]
-      * @author ywx
-      * @date 2022/3/30 11:41
-      * @return com.xhkjedu.vo.ResultVo
-      */
-    public ResultVo deleteById(Integer usid) {
+     * 删除
+     *
+     * @param [usid]
+     * @param schoolid
+     * @return com.xhkjedu.vo.ResultVo
+     * @author ywx
+     * @date 2022/3/30 11:41
+     */
+    public ResultVo deleteById(Integer usid, Integer schoolid) {
         Integer usenum = userUsecretMapper.getUseNumByUsId(usid);//获取密保问题使用频次
-        if (usenum != 0) return new ResultVo(1,"该密保问题被使用禁止删除");
+        if (usenum != 0) return new ResultVo(1, "该密保问题被使用禁止删除");
+        Integer num = usecretMapper.getNumBySchoolId(schoolid);//获取密保问题数量
+        if (num.compareTo(2) != 1) return new ResultVo(1, "密保问题少于两个禁止删除");
         usecretMapper.deleteByPrimaryKey(usid);
-        return new ResultVo(0,"删除成功");
+        return new ResultVo(0, "删除成功");
     }
 
     /**

suser/src/main/resources/mapper/system/UsecertMapper.xml

@@ -3,14 +3,31 @@
 <mapper namespace="com.xhkjedu.suser.mapper.system.UsecretMapper">
     <!--获取密保问题列表-->
     <select id="findAll" resultType="java.util.Map">
-        select u.usid,u.sname,u.sorder,u.createtime,u2.username createname
+        select u.usid,u.sname,u.sorder,u.belong,u.createtime,u2.username createname
         ,(select count(uu.uusid) from t_user_usecret uu where uu.usid=u.usid)usenum
         from t_usecret u left join t_user u2 on u2.userid=u.createid
-        where u.schoolid=#{usecret.schoolid}
-        order by u.createtime desc
+        where u.belong=1
+        <if test="usecret.schoolid!=null and usecret.schoolid!=0">
+            or (u.schoolid=#{usecret.schoolid} and belong=3)
+        </if>
+        order by u.sorder
     </select>
     <!--获取密保问题选择列表-->
     <select id="listForSel" resultType="java.util.Map">
-        select u.usid,u.sname from t_usecret u where u.schoolid=#{schoolid} order by u.sorder
+        select u.usid,u.sname from t_usecret u
+        where u.belong=1
+        <if test="schoolid!=null and schoolid!=0">
+            or (u.schoolid=#{schoolid} and belong=3)
+        </if>
+        order by u.sorder
+    </select>
+    <!--获取密保问题数量-->
+    <select id="getNumBySchoolId" resultType="java.lang.Integer">
+        select count(u.usid) from t_usecret u
+        where u.belong=1
+        <if test="schoolid!=null and schoolid!=0">
+            or (u.schoolid=#{schoolid} and belong=3)
+        </if>
+        order by u.sorder
     </select>
 </mapper>