kangwei：优化字典注解查询，取消权限拦截

@@ -293,7 +293,7 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia
         materialAcceptanceForm.setGoodCode(materialIN.getGoodCode());
         materialAcceptanceForm.setPurchaseContractCode(materialIN.getPurchaseContractCode());
         materialAcceptanceForm.setDistributContractCode(materialIN.getDistributContractCode());
-        materialAcceptanceFormService.save(materialAcceptanceForm);
+        materialAcceptanceFormService.saveOrUpdateMaterialAcceptanceForm(materialAcceptanceForm);
         return null;
     }
     @Transactional
@@ -330,7 +330,7 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia
         materialAcceptanceForm.setGoodCode(materialIN.getGoodCode());
         materialAcceptanceForm.setPurchaseContractCode(materialIN.getPurchaseContractCode());
         materialAcceptanceForm.setDistributContractCode(materialIN.getDistributContractCode());
-        materialAcceptanceFormService.updateById(materialAcceptanceForm);
+        materialAcceptanceFormService.saveOrUpdateMaterialAcceptanceForm(materialAcceptanceForm);
         return null;
     }
     /***

@@ -10,6 +10,7 @@ import com.skua.core.api.vo.DictModel;
 import com.skua.core.aspect.annotation.Dict;
 import com.skua.core.constant.CommonConstant;
 import com.skua.core.util.ConvertUtils;
+import com.skua.modules.common.service.ICommonSqlService;
 import com.skua.modules.system.entity.SysDict;
 import com.skua.modules.system.entity.SysDictItem;
 import com.skua.modules.system.mapper.SysDictItemMapper;
@@ -40,6 +41,8 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
     private SysDictMapper sysDictMapper;
     @Resource
     private SysDictItemMapper sysDictItemMapper;
+    @Autowired
+    private ICommonSqlService  commonSqlService;
 
     @Override
     public <T> JSONObject translateTDictValue(T t) {
@@ -310,13 +313,16 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
     @Override
     public Map<String, Map<String, String>> getBusinessMap(String code, String table, String text,String type) {
         Map<String, Map<String, String>> businessMap = new HashMap<>();
-        List<Map<String, String>> listMap = sysDictMapper.getBusinessMapByTable(code, table, text);
+        //
+        //List<Map<String, String>> listMap = sysDictMapper.getBusinessMapByTable(code, table, text);
+        String sql = " select "+code+","+text+" from "+table;
+        List<Map<String, Object>> listMap =  commonSqlService.queryForList(sql);//通过使用jdbctemplate查询数据，避免权限拦截
         Map<String, String> map = new HashMap<>();
         listMap.forEach(map1 -> {
             if("export".equals(type)) {
-                map.put(String.valueOf(map1.get(code)), map1.get(text));
+                map.put(String.valueOf(map1.get(code)), ConvertUtils.getString(map1.get(text)));
             }else {
-                map.put(map1.get(text),String.valueOf(map1.get(code)));
+                map.put(ConvertUtils.getString(map1.get(text)),String.valueOf(map1.get(code)));
             }
         });
         businessMap.put(table, map);