bug fix

admin-console/src/main/java/com/ibeetl/admin/console/dao/OrgConsoleDao.java

 package com.ibeetl.admin.console.dao;
 
+import java.util.List;
+
 import org.beetl.sql.core.annotatoin.Param;
 import org.beetl.sql.core.annotatoin.SqlResource;
+import org.beetl.sql.core.annotatoin.SqlStatement;
+import org.beetl.sql.core.annotatoin.SqlStatementType;
 import org.beetl.sql.core.engine.PageQuery;
 import org.beetl.sql.core.mapper.BaseMapper;
 
 import com.ibeetl.admin.core.entity.CoreOrg;
-
-import java.util.List;
+import com.ibeetl.admin.core.entity.CoreUser;
 
 @SqlResource("console.org")
 public interface OrgConsoleDao extends BaseMapper<CoreOrg> {
@@ -15,7 +18,8 @@ public interface OrgConsoleDao extends BaseMapper<CoreOrg> {
    
  
 
-    void queryByCondtion(PageQuery query);
-
+    void queryByCondtion(PageQuery<CoreOrg> query);
+    @SqlStatement(type=SqlStatementType.SELECT)
+    void queryUserByCondtion(PageQuery<CoreUser> query);
     void batchDelByIds(@Param(value = "ids") List<Long> ids);
 }

admin-console/src/main/java/com/ibeetl/admin/console/service/OrgConsoleService.java

@@ -10,6 +10,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.ibeetl.admin.console.dao.OrgConsoleDao;
 import com.ibeetl.admin.core.entity.CoreOrg;
+import com.ibeetl.admin.core.entity.CoreUser;
 import com.ibeetl.admin.core.rbac.tree.OrgItem;
 import com.ibeetl.admin.core.service.BaseService;
 import com.ibeetl.admin.core.service.CorePlatformService;
@@ -33,7 +34,7 @@ public class OrgConsoleService extends BaseService<CoreOrg> {
      * 根据条件查询
      * @param query
      */
-    public void queryByCondtion(PageQuery query) {
+    public void queryByCondtion(PageQuery<CoreOrg> query) {
         orgDao.queryByCondtion(query);
         List<CoreOrg> list = query.getList();
         queryListAfter(list);
@@ -45,7 +46,11 @@ public class OrgConsoleService extends BaseService<CoreOrg> {
         	String name = item!=null?item.getName():"";
         	org.set("parentOrgText", name);
         }
-        
+    }
+    
+    public void queryUserByCondition(PageQuery<CoreUser> query) {
+    	orgDao.queryUserByCondtion(query);
+    	queryListAfter(query.getList());
     }
 
 

admin-console/src/main/java/com/ibeetl/admin/console/web/AuditConsoleController.java

@@ -40,7 +40,7 @@ public class AuditConsoleController {
    /*页面*/
     
     @GetMapping(MODEL + "/index.do")
-    @Function("audit")
+    @Function("trace")
     public ModelAndView index() {
 		ModelAndView view = new ModelAndView("/admin/audit/index.html");
 		view.addObject("search", AuditQuery.class.getName());
@@ -52,7 +52,7 @@ public class AuditConsoleController {
 
     @PostMapping(MODEL + "/view.json")
     @ResponseBody
-    @Function("audit.query")
+    @Function("trace")
     public JsonResult<CoreAudit> view(Long id) {
     		CoreAudit audit = auditConsoleService.queryById(id);
         return JsonResult.success(audit);
@@ -61,7 +61,7 @@ public class AuditConsoleController {
     
 
     @RequestMapping(MODEL + "/list.json")
-    @Function("audit.query")
+    @Function("trace")
     @ResponseBody
     public JsonResult<PageQuery<CoreAudit>> list(AuditQuery condtion) {
        
@@ -72,7 +72,7 @@ public class AuditConsoleController {
     
     
     @PostMapping(MODEL + "/list/condition.json")
-    @Function("audit.query")
+    @Function("trace")
     @ResponseBody
     public JsonResult<List<Map<String, Object>>> listCondtion() {
     		List<Map<String, Object>> list = AnnotationUtil.getInstance().getAnnotations(Query.class, AuditQuery.class);

admin-console/src/main/java/com/ibeetl/admin/console/web/DictConsoleController.java

@@ -34,12 +34,12 @@ import org.springframework.web.servlet.ModelAndView;
 import com.ibeetl.admin.console.service.DictConsoleService;
 import com.ibeetl.admin.console.web.dto.DictExcelImportData;
 import com.ibeetl.admin.console.web.query.CoreDictQuery;
-import com.ibeetl.admin.console.web.query.UserQuery;
 import com.ibeetl.admin.core.annotation.Function;
 import com.ibeetl.admin.core.entity.CoreDict;
 import com.ibeetl.admin.core.entity.CoreUser;
 import com.ibeetl.admin.core.file.FileItem;
 import com.ibeetl.admin.core.file.FileService;
+import com.ibeetl.admin.core.service.CorePlatformService;
 import com.ibeetl.admin.core.util.ConvertUtil;
 import com.ibeetl.admin.core.util.PlatformException;
 import com.ibeetl.admin.core.util.ValidateConfig;
@@ -58,6 +58,9 @@ public class DictConsoleController{
     @Autowired private DictConsoleService dictService;
     @Autowired
     FileService fileService;
+    
+    @Autowired
+    CorePlatformService platformService = null;
     /* 页面 */
 
     @GetMapping(MODEL + "/index.do")
@@ -103,6 +106,7 @@ public class DictConsoleController{
     {
         dict.setCreateTime(new Date());
         dictService.save(dict);
+        platformService.clearDictCache();
         return new JsonResult().success();
     }
 
@@ -112,6 +116,7 @@ public class DictConsoleController{
     public JsonResult<String> update(@Validated(ValidateConfig.UPDATE.class)  CoreDict dict) {
         boolean success = dictService.update(dict);
         if (success) {
+        	platformService.clearDictCache();
             return new JsonResult().success();
         } else {
             return JsonResult.failMessage("保存失败");
@@ -135,13 +140,14 @@ public class DictConsoleController{
     public JsonResult delete(String ids) {
     	List<Long> dels = ConvertUtil.str2longs(ids);
         dictService.batchDelCoreDict(dels);
+        platformService.clearDictCache();
         return new JsonResult().success();
     }
     
     @PostMapping(MODEL + "/excel/export.json")
     @Function("dict.export")
     @ResponseBody
-    public JsonResult<String> export(HttpServletResponse response,UserQuery condtion) {
+    public JsonResult<String> export(HttpServletResponse response,CoreDictQuery condtion) {
         String excelTemplate ="excelTemplates/admin/dict/dict_collection_template.xls";
         PageQuery<CoreUser> page = condtion.getPageQuery();
         //取出全部符合条件的

admin-console/src/main/java/com/ibeetl/admin/console/web/OrgConsoleController.java

@@ -174,7 +174,7 @@ public class OrgConsoleController {
     @ResponseBody
     public JsonResult<PageQuery<CoreUser>> getUsers(OrgUserQuery userQuery) {
     	 PageQuery<CoreUser> page = userQuery.getPageQuery();
-         userConsoleService.queryByCondtion(page);
+         orgConsoleService.queryUserByCondition(page);
          return JsonResult.success(page);
     }
    

admin-console/src/main/java/com/ibeetl/admin/console/web/query/OrgUserQuery.java

@@ -17,10 +17,10 @@ public class OrgUserQuery extends PageParam {
 	@Query(name="状态",display=true,type=Query.TYPE_DICT,dict=CoreDictType.USER_STATE)
 	private String state;
 	
-	@Query(name="职务",display=true,type=Query.TYPE_DICT,dict="job_type",group="jobType")
+	@Query(name="职务",display=true,type=Query.TYPE_DICT,dict="job_type",group="job_type")
     private String jobType0;
     
-    @Query(name="职务明细",display=true,type=Query.TYPE_DICT,dict="",group="jobType")
+    @Query(name="职务明细",display=true,type=Query.TYPE_DICT,dict="",group="job_type")
     private String jobType1;
 	
 	private Long orgId;
@@ -50,6 +50,18 @@ public class OrgUserQuery extends PageParam {
 	public void setState(String state) {
 		this.state = state;
 	}
+	public String getJobType0() {
+		return jobType0;
+	}
+	public void setJobType0(String jobType0) {
+		this.jobType0 = jobType0;
+	}
+	public String getJobType1() {
+		return jobType1;
+	}
+	public void setJobType1(String jobType1) {
+		this.jobType1 = jobType1;
+	}
 	
 	
 	

admin-console/src/main/resources/sql/console/org.md

@@ -29,7 +29,31 @@ queryByCondtion
     @}
    
   
+queryUserByCondtion
+===
 
+	 select 
+    @pageTag(){
+    u.*,o.name org_name
+    @}
+    from core_user u left join core_org o on u.org_id=o.id where 1=1 and u.del_flag = 0 
+    and  u.org_id =#orgId#
+    @if(!isEmpty(code)){
+        and  u.code like #"%"+code+"%"#
+    @}
+    @if(!isEmpty(name)){
+        and  u.name like #"%"+name+"%"#
+    @}
+    @if(!isEmpty(state)){
+        and  u.state = #state#
+    @}
+    @if(!isEmpty(jobType0)){
+        and  u.job_type0= #jobType0#
+    @}
+    @if(!isEmpty(jobType1)){
+        and  u.job_type1= #jobType1#
+    @}
+   
 
 
 

admin-console/src/main/resources/static/js/admin/org/orgUser.js

@@ -55,7 +55,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
 					sort : true
 				},
 				 {
-					field : 'jobTypeText',
+					field : 'jobType1Text',
 					title : '职位',
 					width : 80,
 					sort : true

admin-core/src/main/java/com/ibeetl/admin/core/util/beetl/SearchCondtionFunction.java

 package com.ibeetl.admin.core.util.beetl;
 
 
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
 import org.beetl.core.Context;
 import org.beetl.core.Function;
-import org.beetl.ext.simulate.JsonUtil;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ibeetl.admin.core.annotation.Query;
 import com.ibeetl.admin.core.util.AnnotationUtil;
 
@@ -35,6 +32,11 @@ public class SearchCondtionFunction implements Function {
         String className = (String) paras[0];
         try {
             List<Map<String, Object>> list = AnnotationUtil.getInstance().getAnnotations(Query.class, Class.forName(className));
+            for (Iterator<Map<String, Object>> iterator = list.iterator(); iterator.hasNext();) {
+				Map<String, Object> map = iterator.next();
+				if (Boolean.valueOf(map.get("display").toString()) == false)
+					iterator.remove();
+			}
             return list;
         } catch (ClassNotFoundException e ) {
             e.printStackTrace();