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

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/UserDataJBDto.java

@@ -33,4 +33,5 @@ public class UserDataJBDto {
      * 是否有业务操作
      */
     private Boolean hasOperationRecords;
+    private List<Long> role;
     }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PeasantHouseholdMapper.xml

@@ -69,7 +69,7 @@ on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nb
             and developer_code = #{developerCode}
         </if>
         <if test="peasantHouseholdNo!=null and peasantHouseholdNo !=''">
-            and peasant_household_no = #{peasantHouseholdNo}
+            and peasant_household_no like concat ('%',#{peasantHouseholdNo},'%')
         </if>
         ORDER BY creation_time DESC
     </select>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PersonnelBusinessServiceImpl.java

@@ -505,6 +505,7 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
         Boolean hasOperationRecords = hasOperationRecords(id);
         userDataZHDto.setHasOperationRecords(hasOperationRecords);
         userDataJBDto.setHasOperationRecords(hasOperationRecords);
+        userDataJBDto.setRole(JSONArray.parseArray(publicAgencyUse.getRole(),long.class));
 
         return new UserDataDto( userDataZHDto, userDataJBDto ,  userDataZZDto);
     }
@@ -529,6 +530,10 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
         List<String> tableName = personnelBusinessMapper.selectHygfTableName();
         if (CollectionUtil.isNotEmpty(tableName)) {
             for (String table : tableName) {
+                // 排除人员业务信息表, 经销商人员信息, 人员消息
+                if ("hygf_personnel_business".equals(table) || "hygf_unit_info".equals(table) || "hygf_user_message".equals(table)) {
+                    continue;
+                }
                 int count = personnelBusinessMapper.countByUserId(table, userId);
                 if (count > 0) {
                     operateRecord = true;