Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6_temp

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -210,6 +210,22 @@ public class OrgUsrController extends BaseController {
 	}
 
 	/**
+	 * 根据单位code查询单位
+	 *
+	 * @param code
+	 * @return
+	 */
+	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/getUnit/{code}", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "获取单位详情", notes = "获取单位详情")
+	public ResponseModel<OrgUsrFormDto> selectByCode(HttpServletRequest request, @PathVariable String code) throws Exception {
+		LambdaQueryWrapper<OrgUsr> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(OrgUsr::getCode, code);
+		OrgUsr orgUsr = iOrgUsrService.getBaseMapper().selectOne(queryWrapper);
+		return ResponseHelper.buildResponse(iOrgUsrService.selectCompanyById(orgUsr.getSequenceNbr()));
+	}
+
+	/**
 	 * 根据bizOrgType分页查询
 	 *
 	 * @param bizOrgType

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

@@ -354,7 +354,7 @@
                 wls.biz_org_code like  concat (#{param.bizOrgCode},'%')
             </if>
             <if test="param.alarmLogId != null">
-                and wlesal.id = #{alarmLogId}
+                and wlesal.id = #{param.alarmLogId}
             </if>
             <if test="param.warehouseStructureName != null and param.warehouseStructureName != ''">
                 and wlesal.location like concat(concat("%",#{param.warehouseStructureName}),"%")