Merge remote-tracking branch 'origin/develop_dl_bugfix' into develop_dl_bugfix

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CheckController.java

@@ -380,6 +380,7 @@ public class CheckController extends AbstractBaseController {
      * 巡检计划查询
      *
      * @param
+     * @param param
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -712,10 +713,10 @@ public class CheckController extends AbstractBaseController {
         req.put("orgCode", reginParams.getPersonIdentity().getCompanyBizOrgCode());
 
 
-//        if (XJConstant.ROLE_NAME_ADMIN.equalsIgnoreCase(roleTypeName)
-//                || XJConstant.ROLE_NAME_SUPERADMIN.equalsIgnoreCase(roleTypeName)) {
+//        if (XJConstant.ROLE_NAME_ADMIN.equals(roleTypeName.toUpperCase())
+//                || XJConstant.ROLE_NAME_SUPERADMIN.equals(roleTypeName.toUpperCase())) {
 //            req.put("orgCode", loginOrgCode);
-//        } else if (XJConstant.ROLE_NAME_DEPTADMIN.equalsIgnoreCase(roleTypeName)) {
+//        } else if (XJConstant.ROLE_NAME_DEPTADMIN.equals(roleTypeName.toUpperCase())) {
 //            req.put("departmentId",departmentId);
 //        } else {
 //            if(StringUtil.isNotEmpty(req.get("userId"))&&req.get("userId")==null){

amos-boot-system-equip/src/main/resources/mapper/CarMapper.xml

@@ -645,6 +645,7 @@
         s.equipment_id = e.`id`
         and e.category_id = c.id
         and s.biz_org_code <![CDATA[<>]]> ''
+        and e.category_id IN ( SELECT id FROM wl_equipment_category WHERE LEFT ( code, 6 ) = '210101' )
         GROUP BY s.biz_org_code ,c.code
     </select>
 

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml

@@ -2477,11 +2477,15 @@
     <select id="selectListByPatrolCheck" resultType="map">
         SELECT
             c.user_name,
+            c.a.point_name AS pointName,
+            wws.name address,
             ci.*
         FROM
             p_check_input ci
                 left join p_check c on  c.id = ci.check_id
+                LEFT JOIN `p_point` `b` ON `c`.`point_id` = `b`.`id`
                 LEFT JOIN p_point_classify ppc on  ci .point_classify_id = ppc.id
+                LEFT JOIN  wl_warehouse_structure wws on wws.id = b.risk_source_id
         WHERE
             ppc.equipment_id = #{id}
     </select>

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -437,7 +437,7 @@
         FROM
         `p_check` `a`
         <trim prefix="WHERE" prefixOverrides="AND ">
-            <if test="userId!=null and userId!=''">and a.user_id = #{userId}</if>
+            <if test="userId!=null and userId!=''">and find_in_set(#{userId}, a.user_id) > 0</if>
             <if test="bizOrgCode != null and bizOrgCode != ''">
                 and  a.org_code LIKE CONCAT(#{bizOrgCode},'%')
             </if>