1,从命名名称过滤修改

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

@@ -63,7 +63,7 @@
         <if test="dto.type == 'company'">
             and ur.use_unit_credit_code = #{dto.useUnitCreditCode}
         </if>
-           and (1=1 or ur.transfer_to_user_ids like concat('%',#{currentUserId},'%'))
+           OR (ur.transfer_to_user_ids LIKE concat ('%', #{currentUserId}, '%') AND ur.is_delete = 0)
     </where>
     order by ur.rec_date desc
     </select>

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionApplicationModel.java

@@ -75,10 +75,13 @@ public class JyjcInspectionApplicationModel extends BaseModel {
 
     @ApiModelProperty(value = "报检单位编号")
     private String applicationUnitCode;
+
     @ApiModelProperty(value = "报检单位名称")
     private String applicationUnitName;
+
     @ApiModelProperty(value = "报检单位地址")
     private String address;
+
     @ApiModelProperty(value = "监管单位名称")
     private String superviseOrgName;
 
@@ -140,14 +143,14 @@ public class JyjcInspectionApplicationModel extends BaseModel {
 
     @ApiModelProperty(value = "下一步任务名称")
     private String nextTaskName;
+
     @ApiModelProperty(value = "设备分类")
     private String equList;
+
     @ApiModelProperty(value = "监管码")
     private String supervisoryCode;
 
 
-
-
     private String instanceId;
 
     public String getInstanceId() {

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcOpeningApplicationModel.java

@@ -87,7 +87,8 @@ public class JyjcOpeningApplicationModel extends BaseModel {
 
     @ApiModelProperty(value = "创建人ID")
     private String createUserId;
-    /* ----------------  -------------- */
+
+
     @ApiModelProperty (value = "企业资质信息")
     List<TzBaseUnitLicenceDto> baseUnitLicences;