gongdan

zxkf-api/src/main/java/api/controller/order/WorkOrderBaseController.java

@@ -59,14 +59,15 @@ public class WorkOrderBaseController extends BaseController {
     private UserMapper userMapper;
     @Autowired
     private IWorkOrderOperateLogService workorderoperatelogService;
-
+    @Autowired
+    private IRoleService roleService;
     @Autowired
     private ISysAccessoriesService sysaccessoriesService;
 
     @ApiOperation("列表")
     @Log(title = "查询wo_workorderbase列表", businessType = BusinessType.QUERY)
     @GetMapping
-    @Anonymous
+
 
     public AjaxResult getList(WorkOrderBase input, PageInput pageInput) {
         LambdaQueryWrapper<WorkOrderBase> qw = new LambdaQueryWrapper();
@@ -79,14 +80,21 @@ public class WorkOrderBaseController extends BaseController {
         qw.like(!StringHelper.isEmpty(input.getDealuser()), WorkOrderBase::getDealuser, input.getDealuser());
         qw.like(!StringHelper.isEmpty(input.getSource()), WorkOrderBase::getSource, input.getSource());
 
+        qw.eq(!StringHelper.isEmpty(input.getCustomerno()), WorkOrderBase::getCustomerno, input.getCustomerno());
+
         qw.eq(WorkOrderBase::getIsdelete, 0);
 
+        LambdaQueryWrapper<Role> qwrole = new LambdaQueryWrapper();
+        qwrole.in(Role::getRoleId,CurrentUser().getRoleIds());
+        List<Role> roleList= roleService.getList(qwrole);
 
-        List<Role> roleList= CurrentUser().getRoles();
 
-     if(!(roleList.stream().anyMatch(o -> o.getRoleKey().equals("GLY"))  ||   roleList.stream().anyMatch(o -> o.getRoleKey().equals("ZXKF"))))
+        if(!(roleList.stream().anyMatch(o  -> o.getRoleKey().equals("admin"))  ||   roleList.stream().anyMatch(o -> o.getRoleKey().equals("ZXKF"))))
      {
-         qw.eq(!StringHelper.isEmpty(CurrentUser().getUserName()), WorkOrderBase::getCreateuser, CurrentUser().getUserName());
+
+         qw.eq(WorkOrderBase::getCreateuser, CurrentUser().getUserName())
+         .or()
+         .eq(WorkOrderBase::getDealuser, CurrentUser().getUserName());
      }
 
 
@@ -173,7 +181,7 @@ public class WorkOrderBaseController extends BaseController {
 
             //判断手机号存在不customer，不存在就添加新用户
             LambdaQueryWrapper<Customer> qw = new LambdaQueryWrapper<>();
-            qw.eq(Customer::getCustomerPhone, input.getCallnum());
+            qw.eq(Customer::getCustomerNo, input.getCustomerno());
             qw.eq(Customer::getFIsdelete, 0);
             Customer record = customerService.getEntity(qw);
             if (record == null) {
@@ -183,6 +191,8 @@ public class WorkOrderBaseController extends BaseController {
                 customer.setType(1L);
                 customer.setFIsdelete(0L);
                 customer.setFCreatetime(currentDate);
+                customer.setCustomerNo(input.getCustomerno());
+
                 boolean customerresult = customerService.insert(customer);
             }
             return Success("成功",input.getWorkorderId());
@@ -333,7 +343,7 @@ public class WorkOrderBaseController extends BaseController {
             boolean logresult = addlog("留言创建了工单", 1L, "", input.getWorkordercode(),"");
             //判断手机号存在不customer，不存在就添加新用户
             LambdaQueryWrapper<Customer> qw = new LambdaQueryWrapper<>();
-            qw.eq(Customer::getCustomerPhone, input.getCallnum());
+            qw.eq(Customer::getCustomerNo, input.getCustomerno());
             qw.eq(Customer::getFIsdelete, 0);
             Customer record = customerService.getEntity(qw);
             if (record == null) {
@@ -343,7 +353,7 @@ public class WorkOrderBaseController extends BaseController {
                 customer.setCustomerPhone(input.getCallnum());
                 customer.setFIsdelete(0L);
                 customer.setFCreatetime(currentDate);
-
+                customer.setCustomerNo(input.getCustomerno());
 
                 boolean customerresult = customerService.insert(customer);
             }

zxkf-entity/src/main/java/api/entity/database/order/WorkOrderBase.java

@@ -109,4 +109,7 @@ public class WorkOrderBase {
     @ApiModelProperty("ip地址")
     private String ip;
 
+    @ApiModelProperty("用户编号")
+    private String customerno;
+
 }