使用登记参数调整

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgUseRegistrationDto.java

@@ -106,4 +106,6 @@ public class JgUseRegistrationDto  extends BaseDto {
     private String unitCode;
 
     private String isXixian;
+
+    private String currentUserId;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -30,7 +30,8 @@
         ur.use_registration_code  as useRegistrationCode,
         date_format(ur.audit_pass_date,'%Y-%m-%d')  as auditPassDate,
         ur.receive_org_name as receiveOrgName,
-        ur.next_execute_user_ids as nextExecuteUserIds
+        ur.next_execute_user_ids as nextExecuteUserIds,
+        ur.next_task_id as nextTaskId
         from tzs_jg_use_registration ur
         LEFT JOIN tzs_jg_use_registration_eq re  on ur.sequence_nbr = re.equip_transfer_id
         LEFT JOIN idx_biz_jg_register_info jri  on re.equ_id = jri.RECORD
@@ -38,7 +39,7 @@
         LEFT JOIN idx_biz_jg_other_info  other   on re.equ_id = other.RECORD
 
         <where>
-            and  ur.is_delete = 0
+            and  ur.is_delete = 0  and (1=1 or ur.transfer_to_user_ids like concat('%',#{dto.currentUserId},'%'))
             <if test="dto.equCategory != null and dto.equCategory != ''">
                 and jri.EQU_CATEGORY = #{dto.equCategory}
             </if>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationController.java

@@ -85,6 +85,7 @@ public class JgUseRegistrationController extends BaseController {
                                                             @RequestParam(value = "size") int size) {
         Page<Map<String, Object>> page = new Page<>(current, size);
         ReginParams info = getSelectedOrgInfo();
+        dto.setCurrentUserId(info.getUserModel().getUserId());
         if (info.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)){
             dto.setDataType(BaseController.COMPANY_TYPE_COMPANY);
         }else {