Commit 3adc91c4 authored by zhangsen's avatar zhangsen

bug修改

parent d2fe22d5
...@@ -72,7 +72,7 @@ public class PersonQrCodeController extends BaseController { ...@@ -72,7 +72,7 @@ public class PersonQrCodeController extends BaseController {
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
map.put("qrCodeColor", item.getCode()); map.put("qrCodeColor", item.getCode());
map.put("name", item.getName()); map.put("name", item.getName());
map.put("value", collect.getOrDefault(item.getCode(), 0)); map.put("value", Integer.parseInt(collect.getOrDefault(item.getCode(), 0).toString()));
maps.add(map); maps.add(map);
}); });
return ResponseHelper.buildResponse(maps); return ResponseHelper.buildResponse(maps);
......
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
AND b.COMPANY_CODE like concat(#{parentCode},'%') AND b.ORG_CODE like concat(#{parentCode},'%')
</if> </if>
<if test="date != null and date != ''"> <if test="date != null and date != ''">
AND a.UPDATE_TIME like concat(#{date},'%') AND a.UPDATE_TIME like concat(#{date},'%')
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
AND b.COMPANY_CODE like concat(#{parentCode},'%') AND b.ORG_CODE like concat(#{parentCode},'%')
</if> </if>
<if test="date != null and date != ''"> <if test="date != null and date != ''">
AND a.UPDATE_TIME like concat(#{date},'%') AND a.UPDATE_TIME like concat(#{date},'%')
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
AND b.COMPANY_CODE like concat(#{parentCode},'%') AND b.ORG_CODE like concat(#{parentCode},'%')
</if> </if>
<if test="date != null and date != ''"> <if test="date != null and date != ''">
AND a.CREATE_TIME like concat(#{date},'%') AND a.CREATE_TIME like concat(#{date},'%')
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE
<where> <where>
<if test="parentCode != null and parentCode != ''"> <if test="parentCode != null and parentCode != ''">
AND b.COMPANY_CODE like concat(#{parentCode},'%') AND b.ORG_CODE like concat(#{parentCode},'%')
</if> </if>
<if test="date != null and date != ''"> <if test="date != null and date != ''">
AND a.CREATE_TIME like concat(#{date},'%') AND a.CREATE_TIME like concat(#{date},'%')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment