微信小程序企业详情和企业列表修改

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/TzBaseEnterpriseInfoMapper.java

@@ -41,6 +41,6 @@ public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseI
 	 */
 	TzBaseEnterpriseInfo selectByUseUnit(String useUnit);
 
-	@DataAuth(interfacePath = "enterprise")
+
 	IPage<TzBaseEnterpriseInfoDto> page(Page<TzBaseEnterpriseInfoDto> page, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto);
 }

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

@@ -76,6 +76,10 @@
 				test="tzBaseEnterpriseInfoDto.legalPhone!=null and tzBaseEnterpriseInfoDto.legalPhone!='' ">
 				AND legal_phone LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.legalPhone},'%') 
 			</if>
+		  <if
+				  test="tzBaseEnterpriseInfoDto.superviseOrgCode!=null and tzBaseEnterpriseInfoDto.superviseOrgCode!='' ">
+			  AND supervise_org_code LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.superviseOrgCode},'%')
+		  </if>
 			AND is_delete = 0
 		</where>
 	</select>

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

 package com.yeejoin.amos.boot.module.tzs.biz.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.module.tzs.api.common.MobileLoginParam;
+import com.yeejoin.amos.boot.module.tzs.api.dto.TzBaseEnterpriseInfoDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.PageParam;
+import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
+import com.yeejoin.amos.boot.module.tzs.api.service.ITzBaseEnterpriseInfoService;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.TzsAppService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -20,6 +32,8 @@ public class TzsAppController {
 
     @Autowired
     TzsAppService appService;
+    @Autowired
+    ITzBaseEnterpriseInfoService iTzBaseEnterpriseInfoService;
 
     /**
      * 获取设计信息
@@ -54,4 +68,19 @@ public class TzsAppController {
         return ResponseHelper.buildResponse(appService.login(param));
     }
 
+  /**
+   * 小程序企业详情
+   * */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/details", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "小程序企业详情", notes = "小程序企业详情")
+    public ResponseModel<IPage<TzBaseEnterpriseInfoDto>> pageInfo( String unitCode) {
+        PageParam pageParam = new PageParam();
+        LambdaQueryWrapper<TzBaseEnterpriseInfo> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        objectLambdaQueryWrapper.eq(!ValidationUtil.isEmpty(unitCode),TzBaseEnterpriseInfo::getUseCode,unitCode);
+        TzBaseEnterpriseInfo neInfo = iTzBaseEnterpriseInfoService.getOne(objectLambdaQueryWrapper, true);
+        String companyName="";
+        return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.page(pageParam, neInfo.getUseUnit()));
+    }
+
 }

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
 
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -109,6 +110,8 @@ public class TzBaseEnterpriseInfoServiceImpl
 
 	/**机器人用户token缓存key */
 	public static final String TZS_USER_TOKEN = "TZS_USER_TOKEN";
+	@Autowired
+	private EquipmentCategoryServiceImpl equipmentCategoryService;
 
 	@Override
 	public List<EquEnterDto> getInfo(String sequenceNbr) {
@@ -125,6 +128,11 @@ public class TzBaseEnterpriseInfoServiceImpl
 			}
 		}
 		Page<TzBaseEnterpriseInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
+		JSONObject companyType = equipmentCategoryService.getCompanyType();
+		String orgCode = companyType.getString("orgCode");
+		if (!ValidationUtil.isEmpty(orgCode)) {
+			tzBaseEnterpriseInfoDto.setSuperviseOrgCode(orgCode);
+		}
 		return this.baseMapper.page(page, tzBaseEnterpriseInfoDto);
 	}