货道接口返回字段添加商品分类ID,名称

src/main/java/com/minpay/shouhuo/equmentaction/MachineManageAction.java

@@ -121,7 +121,6 @@ public class MachineManageAction implements IMINAction {
         //操作员id
         String uId = user.getId();
         //渠道
-        String channel = user.getChannel();
         // 查询条件
         Map<String, String> map = new HashMap<String, String>();
         map.put("channel", "V01");
@@ -131,8 +130,7 @@ public class MachineManageAction implements IMINAction {
         map.put("userName", userName);
         map.put("dates", dates);
         map.put("machineNo", machineNo);
-        map.put("machineNomax", machineNomax);
-        map.put("machineNomin", machineNomin);
+        map.put("branchId",user.getBranchId());
         List<Map<String, Object>> list = Service.lookup(IMINDataBaseService.class)
                 .getMybatisMapper(MachineManageMapper.class)
                 .queryEquipment(map, rows);

src/main/resources/com/minpay/db/table/own/mapper/MachineManageMapper.xml

@@ -78,7 +78,9 @@
 		rel.VCI_CREATE_TIME 			'createTime',
 		us2.USR_NAME 					'modifyUser',
 		rel.VCI_MODIFY_TIME 			'modifyTime',
-		rel.VCI_EXEIT_STATE 			'perState'
+		rel.VCI_EXEIT_STATE 			'perState',
+		vci.VCI_ID  				'categoryId',
+		vci.VCI_NAME 				'categoryName'
 		FROM
 		vm_pro_equ_rel rel
 		LEFT JOIN vm_equipment_inf equ
@@ -94,6 +96,8 @@
 		LEFT JOIN im_user us2
 		ON us2.USR_ID = rel.VCI_MODIFY_USER
 		AND us2.USR_CHANNEL = rel.VCI_CHANNEL
+		LEFT JOIN vm_category_inf vci
+		ON vci.VCI_ID = pro.PRT_CATEGORY_ID
 		WHERE  rel.VCI_CHANNEL = #{channel, jdbcType = VARCHAR}
 		AND rel.VCI_EXEIT_STATE !='02'
 		<if test="equId != null and equId != ''">
@@ -170,10 +174,8 @@
 		FROM vm_equipment_inf equ
 		LEFT JOIN im_user us1
 		ON us1.USR_ID = equ.VEQ_CREATE_USER
-		AND us1.USR_CHANNEL = equ.VEQ_CHANNEL
 		LEFT JOIN im_user us2
 		ON us2.USR_ID = equ.VEQ_MODIFY_USER
-		AND us2.USR_CHANNEL = equ.VEQ_CHANNEL
 		WHERE equ.VEQ_CHANNEL = 'V01'
 		AND equ.VEQ_STATE != '03' AND equ.VEQ_STATE != '02'
 		<if test="equName != null and equName != ''">
@@ -197,6 +199,9 @@
 		<if test="userId != null and userId != ''">
 			AND equ.VEQ_USER_ID = #{userId, jdbcType = VARCHAR}
 		</if>
+		<if test="branchId != null and branchId != ''">
+			AND us1.USR_BRANCHID = #{branchId, jdbcType = VARCHAR}
+		</if>
 		<if test="agentId != null and agentId != ''">
 			AND cus.USR_PARENT_USER = #{agentId, jdbcType = VARCHAR}
 		</if>