1、工单修改功能——工单是否紧急，状态无法修改问题修复

2、用户查询功能——根据名字查询无效问题修复

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/workorderController/TemplateController.java

@@ -17,10 +17,6 @@ import org.jeecg.modules.workorderParamStepfour.entity.WorkorderParamStepfour;
 import org.jeecg.modules.workorderParamStepone.entity.WorkorderParamStepone;
 import org.jeecg.modules.workorderParamStepthree.entity.WorkorderParamStepthree;
 import org.jeecg.modules.workorderParamSteptwo.entity.WorkorderParamSteptwo;
-import org.jeecg.modules.workorderStepfour.entity.WorkorderStepfour;
-import org.jeecg.modules.workorderStepone.entity.WorkorderStepone;
-import org.jeecg.modules.workorderStepthree.entity.WorkorderStepthree;
-import org.jeecg.modules.workorderSteptwo.entity.WorkorderSteptwo;
 import org.jeecg.modules.workorderTemplate.entity.WorkorderTemplate;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -67,10 +63,11 @@ public class TemplateController {
         workorderTemplate.setNumber(templateBean.getNumber());
         workorderTemplate.setRemark(templateBean.getRemark());
         workorderTemplate.setStatusId(templateBean.getStatusId());
+        workorderTemplate.setIsEmergency(templateBean.getIsEmergency());
 
         if(StringUtils.isEmpty(templateBean.getId())){
             message = "工单id未填写，请填写工单id!";
-        }else if(StringUtils.isEmpty(templateBean.getNumber().toString())){
+        }else if(null == templateBean.getNumber() || "".equals(templateBean.getNumber())){
             message = "数量未填写，请填写数量";
         }else if(StringUtils.isEmpty(templateBean.getStatusId())){
             message = "状态id未填写，请填写状态id";

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/workorderController/UserController.java

@@ -28,8 +28,8 @@ public class UserController {
 
     @ApiOperation(value="用户信息-查询用户信息列表", notes="用户信息-查询用户信息列表")
     @RequestMapping(value = "/queryUserList", method = {RequestMethod.GET})
-    public Result<?> queryUserList(PageBean pageBean){
-        return userService.queryUserList(pageBean);
+    public Result<?> queryUserList(String name, PageBean pageBean){
+        return userService.queryUserList(name, pageBean);
     }
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserService.java

@@ -2,7 +2,6 @@ package org.jeecg.modules.apiService;
 
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.apiBean.PageBean;
-import org.jeecg.modules.apiBean.UserBean;
 import org.jeecg.modules.workorderUser.entity.WorkorderUser;
 
 public interface UserService {
@@ -11,7 +10,7 @@ public interface UserService {
      * 查询用户列表
      * @return
      */
-    public Result<?> queryUserList(PageBean pageBean);
+    public Result<?> queryUserList(String name, PageBean pageBean);
 
     /**
      * 用户信息-根据id查询用户信息

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserServiceImpl.java

@@ -1,6 +1,8 @@
 package org.jeecg.modules.apiService.impl;
 
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.apiService.UserService;
@@ -40,11 +42,21 @@ public class UserServiceImpl implements UserService {
 
     //查询用户列表
     @Override
-    public Result<?> queryUserList(PageBean pageBean) {
+    public Result<?> queryUserList(String name, PageBean pageBean) {
+
+        //分页
         Page<WorkorderUser> page = new Page<WorkorderUser>(pageBean.getPageNo(), pageBean.getPageSize());
-        Page<WorkorderUser> pageList = workorderUserService
-                .lambdaQuery()
-                .page(page);
+        LambdaQueryChainWrapper<WorkorderUser> query = workorderUserService
+                .lambdaQuery();
+
+        //组装查询条件
+        if(StringUtils.isNotEmpty(name)){
+            //用户姓名
+            query.like(WorkorderUser::getName, name);
+        }
+
+        //获取用户信息
+        Page<WorkorderUser> pageList = query.page(page);
 
         return Result.OK("用户信息列表", pageList);
     }