于继渤 2 лет назад
Родитель
Сommit
ac211278a1

+ 4 - 1
src/main/java/com/dk/mdm/mapper/mst/RoleMapper.xml

@@ -102,7 +102,10 @@
             <if test="flgNolimitSen != null">
                 AND flg_nolimit_sen = #{flgNolimitSen}
             </if>
-
+            <if test="flgValidList != null and flgValidList.size()>0">
+                AND flg_valid =
+                any(#{flgValidList, typeHandler=BooleanListTypeHandler})
+            </if>
             <if  test="searchText != null">
                 AND (role_name  like concat('%', my_ex.likequery(#{searchText}) , '%')
                 OR  role_code  like concat('%', my_ex.likequery(#{searchText}) , '%')

+ 3 - 0
src/main/java/com/dk/mdm/model/query/mst/RoleQuery.java

@@ -22,6 +22,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  *  角色
@@ -173,6 +174,8 @@ public class RoleQuery extends PageInfo<Role> implements Serializable {
     @ApiModelProperty(value = "")
     private Boolean flgNolimitSen;
 
+    private List<Boolean> flgValidList;
+
     private String searchText;
 
 

+ 11 - 3
src/main/java/com/dk/mdm/service/mst/CustomerService.java

@@ -108,7 +108,7 @@ public class CustomerService extends BaseService<Customer> {
 
 
         //设置公司id
-        customer.setCpId(authUtils.getStaff().getCpId());
+//        customer.setCpId(authUtils.getStaff().getCpId());
         //报备人
         customer.setReportStaff(authUtils.getStaff().getStaffId());
         //报备日期
@@ -136,7 +136,11 @@ public class CustomerService extends BaseService<Customer> {
         return ResponseResultUtil.success();
     }
 
-
+    /**
+     * @desc : 跟据id查询
+     * @author : 于继渤
+     * @date : 2023/1/5 9:39
+     */
     public ResponseResultVO<CustomerResponse> selectByIdRespone(@PathVariable String id) {
         CustomerResponse customerResponse = customerMapper.selectByIdRespone(id);
         if (customerResponse == null) {
@@ -144,7 +148,11 @@ public class CustomerService extends BaseService<Customer> {
         }
         return ResponseResultUtil.success(customerResponse);
     }
-
+    /**
+     * @desc : 不分页查询
+     * @author : 于继渤
+     * @date : 2023/1/5 9:39
+     */
     public ResponseResultVO<List<CustomerResponse>> selectByCondNoPage(CustomerQuery customerQuery) {
         List<CustomerResponse> customerResponses = customerMapper.selectByCond(customerQuery);
         return ResponseResultUtil.success(customerResponses);