'commit'

dsBase/src/main/java/com/dsideal/base/Menu/Controller/MenuController.java

@@ -153,8 +153,8 @@ public class MenuController extends Controller {
     @EmptyInterface({"menu_name", "url", "memo", "identity_ids"})
     @IsNumericInterface({"parent_id", "sort_id", "for_school", "for_bureau"})
     @LengthInterface({"menu_name,1,32", "memo,1,255"})
-    public void AddMenu(int parent_id, int sort_id, String identity_ids, String menu_name, String url, String memo, int for_school, int for_bureau) {
-        int menu_id = model.AddMenu(parent_id, sort_id, menu_name, url, memo, identity_ids, for_school, for_bureau);
+    public void AddMenu(int parent_id, int sort_id, String identity_ids, String menu_name, String url, String memo, int for_school, int for_bureau,String icon,int isFull) {
+        int menu_id = model.AddMenu(parent_id, sort_id, menu_name, url, memo, identity_ids, for_school, for_bureau,icon,isFull);
         JSONObject map = new JSONObject();
         map.put("menu_id", menu_id);
         if (menu_id > 0) {
@@ -190,8 +190,8 @@ public class MenuController extends Controller {
     @EmptyInterface({"menu_name", "url", "memo", "identity_ids"})
     @IsNumericInterface({"menu_id", "sort_id", "for_school", "for_bureau"})
     @LengthInterface({"menu_name,1,32", "memo,1,255"})
-    public void UpdateMenu(int menu_id, int sort_id, String menu_name, String identity_ids, String url, String memo, int for_school, int for_bureau) {
-        model.UpdateMenu(menu_id, menu_name, sort_id, url, memo, identity_ids, for_school, for_bureau);
+    public void UpdateMenu(int menu_id, int sort_id, String menu_name, String identity_ids, String url, String memo, int for_school, int for_bureau,String icon,int isFull) {
+        model.UpdateMenu(menu_id, menu_name, sort_id, url, memo, identity_ids, for_school, for_bureau,icon,isFull);
         renderJson(CommonUtil.returnMessageJson(true, "修改成功！"));
     }
 
@@ -207,11 +207,11 @@ public class MenuController extends Controller {
     public void selectMenuByDutyInCharge(String id) {
         BaseModel bm = new BaseModel();
         List<Record> list = bm.getOrgTypePrincipalshipById(id);
-        if (list == null || list.size() == 0) {
+        if (list == null || list.isEmpty()) {
             renderJson(CommonUtil.returnMessageJson(false, "无法获取指定ID的信息！"));
             return;
         }
-        Record record = list.get(0);
+        Record record = list.getFirst();
         int duties_id, in_charge_id;
         int level_id = record.getInt("level");
         if (level_id == 4) {

dsBase/src/main/java/com/dsideal/base/Menu/Model/MenuModel.java

@@ -215,7 +215,7 @@ public class MenuModel {
      * @param url
      * @param memo
      */
-    public int AddMenu(int parent_id, int sort_id, String menu_name, String url, String memo, String identity_ids, int for_school, int for_bureau) {
+    public int AddMenu(int parent_id, int sort_id, String menu_name, String url, String memo, String identity_ids, int for_school, int for_bureau, String icon, int isFull) {
         //查找它父结点的level_id
         Record record = Db.findById("t_base_menu", "menu_id", parent_id);
         if (record == null) {
@@ -232,6 +232,8 @@ public class MenuModel {
         record.set("level_id", level_id);
         record.set("for_school", for_school);
         record.set("for_bureau", for_bureau);
+        record.set("icon", icon);
+        record.set("isFull", isFull);
         Db.save("t_base_menu", "menu_id", record);
         int menu_id = record.getInt("menu_id");
         //保存菜单与身份的关系
@@ -267,7 +269,7 @@ public class MenuModel {
      * @param url
      * @param memo
      */
-    public boolean UpdateMenu(int menu_id, String menu_name, int sort_id, String url, String memo, String identity_ids, int for_school, int for_bureau) {
+    public boolean UpdateMenu(int menu_id, String menu_name, int sort_id, String url, String memo, String identity_ids, int for_school, int for_bureau,String icon,int isFull) {
         Record record = Db.findById("t_base_menu", "menu_id", menu_id);
         if (record == null) {
             return false;
@@ -278,6 +280,8 @@ public class MenuModel {
         record.set("memo", memo);
         record.set("for_school", for_school);
         record.set("for_bureau", for_bureau);
+        record.set("icon",icon);
+        record.set("isFull",isFull);
         Db.update("t_base_menu", "menu_id", record);
 
         //保存菜单与身份的关系