Merge remote-tracking branch 'origin/dev-nx' into dev-nx

sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java

@@ -173,6 +173,9 @@ public class MaType extends BaseEntity {
     @ApiModelProperty(value = "库管员id")
     private List<Long> keeperUserId;
 
+    @ApiModelProperty(value = "库管员id")
+    private String keeperUserIds;
+
     /** 库管员名称 */
     @ApiModelProperty(value = "库管员名称")
     @Excel(name = "库管员")

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java

@@ -39,8 +39,8 @@ public class MaTypeServiceImpl implements ITypeService {
     public MaType selectMaTypeByTypeId(Long typeId) {
         MaType maType = maTypeMapper.selectMaTypeByTypeId(typeId);
         List<Long> idList = new ArrayList<>();
-        if (maType.getKeeperUserId() != null) {
+        if (StringUtils.isNotBlank(maType.getKeeperUserIds())) {
-            String[] idStrings = maType.getTypeName().split(",");
+            String[] idStrings = maType.getKeeperUserIds().split(",");
             for (String idString : idStrings) {
                 try {
                     Long id = Long.parseLong(idString.trim());

sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml

@@ -280,7 +280,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select m.type_id, m.type_name, m.parent_id, m.status, m.num, m.unit_id,m.unit_name, m.manage_type,
                m.lease_price, m.eff_time, m.rent_price, m.buy_price, m.pay_price, m.level, m.rated_load, m.test_load,
                m.holding_time, m.warn_num, mtf.file_name photoName, mtf.file_url photoUrl,
-               mtf2.file_name documentName, mtf2.file_url documentUrl, GROUP_CONCAT(mtk.user_id) keeperUserId,
+               mtf2.file_name documentName, mtf2.file_url documentUrl, GROUP_CONCAT(mtk.user_id) keeperUserIds,
                GROUP_CONCAT(su.nick_name) as keeperUserName, mtr.user_id repairUserId, su1.nick_name repairUserName,mpi.prop_id as propId, mpi.prop_name as propName,
                m.del_flag, m.create_by, m.create_time,
                m.remark, m.company_id,m.fac_model as facModel