Merge branch 'dev' into dev-web

ruoyi-sim/src/main/java/com/ruoyi/sim/controller/StudentController.java

@@ -6,7 +6,6 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.sim.domain.Student;
 import com.ruoyi.sim.constant.Consts;
 import com.ruoyi.sim.service.impl.StudentService;
 import com.ruoyi.system.service.ISysDeptService;
@@ -19,8 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 @Api("学生Controller")
 @RestController
 @RequestMapping("/sim/student")
@@ -65,8 +62,6 @@ public class StudentController extends BaseController {
     /**
      * 新增学生
      */
-    // @PreAuthorize("@ss.hasPermi('sim:student:add')")
-    // @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation("新增学生")
     public AjaxResult add(@Validated @RequestBody SysUser user) {
@@ -97,8 +92,6 @@ public class StudentController extends BaseController {
     /**
      * 修改学生
      */
-    // @PreAuthorize("@ss.hasPermi('sim:student:edit')")
-    // @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping
     @ApiOperation("修改学生")
     public AjaxResult edit(@Validated @RequestBody SysUser user) {
@@ -123,8 +116,6 @@ public class StudentController extends BaseController {
     /**
      * 删除学生
      */
-    // @PreAuthorize("@ss.hasPermi('sim:student:remove')")
-    // @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
     @ApiOperation("删除学生")
     public AjaxResult remove(@PathVariable Long[] userIds) {

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -284,6 +284,9 @@
         <if test="phonenumber != null and phonenumber != ''">
             AND u.phonenumber like concat('%', #{phonenumber}, '%')
         </if>
+        <if test="nickName != null and nickName != ''">
+            AND u.nick_name like concat('%', #{nickName}, '%')
+        </if>
         <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
             AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
         </if>